On Fri, 17 Apr 2015, Charles Keepax wrote: > This also handily fixes a leak of the GPIO in arizona_dev_exit. > > Signed-off-by: Charles Keepax <[email protected]> > --- > drivers/mfd/arizona-core.c | 10 ++++------ > 1 files changed, 4 insertions(+), 6 deletions(-)
Acked-by: Lee Jones <[email protected]> > diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c > index 6ca6dfa..be8b1a4 100644 > --- a/drivers/mfd/arizona-core.c > +++ b/drivers/mfd/arizona-core.c > @@ -728,9 +728,9 @@ int arizona_dev_init(struct arizona *arizona) > > if (arizona->pdata.reset) { > /* Start out with /RESET low to put the chip into reset */ > - ret = gpio_request_one(arizona->pdata.reset, > - GPIOF_DIR_OUT | GPIOF_INIT_LOW, > - "arizona /RESET"); > + ret = devm_gpio_request_one(arizona->dev, arizona->pdata.reset, > + GPIOF_DIR_OUT | GPIOF_INIT_LOW, > + "arizona /RESET"); > if (ret != 0) { > dev_err(dev, "Failed to request /RESET: %d\n", ret); > goto err_dcvdd; > @@ -1054,10 +1054,8 @@ int arizona_dev_init(struct arizona *arizona) > err_irq: > arizona_irq_exit(arizona); > err_reset: > - if (arizona->pdata.reset) { > + if (arizona->pdata.reset) > gpio_set_value_cansleep(arizona->pdata.reset, 0); > - gpio_free(arizona->pdata.reset); > - } > regulator_disable(arizona->dcvdd); > err_enable: > regulator_bulk_disable(arizona->num_core_supplies, -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
