diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-12 16:51:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-12 16:51:22 +0200 |
| commit | a791dc135325862fdf491ac088f54993710e2515 (patch) | |
| tree | 3fe941c0d8b8d315ad4b2235836462e0820f98ae /drivers/iio/light/cm3605.c | |
| parent | d11b1e908e9a1301e43cefc37fc17dd2b1257b77 (diff) | |
| parent | 80e78fcce86de0288793a0ef0f6acf37656ee4cf (diff) | |
Merge 6.0-rc5 into driver-core-next
We need the driver core and debugfs changes in this branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/light/cm3605.c')
| -rw-r--r-- | drivers/iio/light/cm3605.c | 6 |
1 files 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); |