Hi Arnd, On 7/5/2013 11:51 PM, Arnd Bergmann wrote: > The em_x270_mci_setpower() and em_x270_usb_hub_init() functions > call regulator_enable(), which may return an error that must > be checked. > > This changes the em_x270_usb_hub_init() function to bail out > if it fails, and changes the pxamci_platform_data->setpower > callback so that the a failed em_x270_mci_setpower call > can be propagated by the pxamci driver into the mmc core. > > Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx> > Cc: Mike Rapoport <mike@xxxxxxxxxxxxxx> > Cc: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx> > Cc: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> > Cc: Haojian Zhuang <haojian.zhuang@xxxxxxxxx> > Cc: Chris Ball <cjb@xxxxxxxxxx> > > diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c > index f6726bb..f8062e4 100644 > --- a/arch/arm/mach-pxa/em-x270.c > +++ b/arch/arm/mach-pxa/em-x270.c > @@ -477,16 +477,24 @@ static int em_x270_usb_hub_init(void) > /* USB Hub power-on and reset */ > gpio_direction_output(usb_hub_reset, 1); > gpio_direction_output(GPIO9_USB_VBUS_EN, 0); > - regulator_enable(em_x270_usb_ldo); > + err = regulator_enable(em_x270_usb_ldo); > + if (err) > + goto err_free_rst_gpio; > + > gpio_set_value(usb_hub_reset, 0); > gpio_set_value(usb_hub_reset, 1); > regulator_disable(em_x270_usb_ldo); > - regulator_enable(em_x270_usb_ldo); > + if (err) > + goto err_free_rst_gpio; > + > + err = regulator_enable(em_x270_usb_ldo); Didn't you mean the other way around: regulator_disable(em_x270_usb_ldo); - regulator_enable(em_x270_usb_ldo); + err = regulator_enable(em_x270_usb_ldo); + if (err) + goto err_free_rst_gpio; + ? Hein > gpio_set_value(usb_hub_reset, 0); > gpio_set_value(GPIO9_USB_VBUS_EN, 1); > > return 0; > > +err_free_rst_gpio: > + gpio_free(usb_hub_reset); > err_free_vbus_gpio: > gpio_free(GPIO9_USB_VBUS_EN); > err_free_usb_ldo: > @@ -592,7 +600,7 @@ err_irq: > return err; > } > <snip> -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
