| Message ID | 0e186de2c125b3e17476ebf9c54eae4a5d66f994.1659854238.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | iio: light: cm3605: Fix an error handling path in cm3605_probe() | expand |
On Sun, 7 Aug 2022 08:37:43 +0200 Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote: > The commit in Fixes also introduced a new error handling path which should > goto the existing error handling path. > Otherwise some resources leak. > > Fixes: 0d31d91e6145 ("iio: light: cm3605: Make use of the helper function dev_err_probe()") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> oops. Applied to the fixes-togreg branch of iio.git. I've just move that branch forwards to current char-misc-linus which includes Greg's pull requests for this cycle via Linus' tree, but may well rebase on rc1 once that's available. Thanks, Jonathan > --- > drivers/iio/light/cm3605.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/iio/light/cm3605.c b/drivers/iio/light/cm3605.c > index c721b69d5095..0b30db77f78b 100644 > --- a/drivers/iio/light/cm3605.c > +++ b/drivers/iio/light/cm3605.c > @@ -226,8 +226,10 @@ static int cm3605_probe(struct platform_device *pdev) > } > > irq = platform_get_irq(pdev, 0); > - if (irq < 0) > - return dev_err_probe(dev, irq, "failed to get irq\n"); > + if (irq < 0) { > + ret = dev_err_probe(dev, irq, "failed to get irq\n"); > + goto out_disable_aset; > + } > > ret = devm_request_threaded_irq(dev, irq, cm3605_prox_irq, > NULL, 0, "cm3605", indio_dev);
diff --git a/drivers/iio/light/cm3605.c b/drivers/iio/light/cm3605.c index c721b69d5095..0b30db77f78b 100644 --- a/drivers/iio/light/cm3605.c +++ b/drivers/iio/light/cm3605.c @@ -226,8 +226,10 @@ static int cm3605_probe(struct platform_device *pdev) } irq = platform_get_irq(pdev, 0); - if (irq < 0) - return dev_err_probe(dev, irq, "failed to get irq\n"); + if (irq < 0) { + ret = dev_err_probe(dev, irq, "failed to get irq\n"); + goto out_disable_aset; + } ret = devm_request_threaded_irq(dev, irq, cm3605_prox_irq, NULL, 0, "cm3605", indio_dev);
The commit in Fixes also introduced a new error handling path which should goto the existing error handling path. Otherwise some resources leak. Fixes: 0d31d91e6145 ("iio: light: cm3605: Make use of the helper function dev_err_probe()") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/iio/light/cm3605.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)