| Message ID | b45b4b638db109c6078d243252df3a7b0485f7d5.1683875389.git.mazziesaccount@gmail.com |
|---|---|
| State | Accepted |
| Commit | 56cd3d1c5c5b073a1a444eafdcf97d4d866d351a |
| Headers | show |
| Series | fix fwnode_irq_get_byname() returnvalue | expand |
On Fri, 12 May 2023 10:53:41 +0300 Matti Vaittinen <mazziesaccount@gmail.com> wrote: > The fwnode_irq_get_byname() was returning 0 at device-tree mapping > error. If this occurred, the KX022A driver did abort the probe but > errorneously directly returned the return value from > fwnode_irq_get_byname() from probe. In case of a device-tree mapping > error this indicated success. > > The fwnode_irq_get_byname() has since been fixed to not return zero on > error so the check for fwnode_irq_get_byname() can be relaxed to only > treat negative values as errors. This will also do decent fix even when > backported to branches where fwnode_irq_get_byname() can still return > zero on error because KX022A probe should later fail at IRQ requesting > and a prober error handling should follow. On that basis I've picked this one up directly for the fixes-togreg branch of iio.git and marked it for stable. Thanks, Jonathan > > Relax the return value check for fwnode_irq_get_byname() to only treat > negative values as errors. > > Reported-by: kernel test robot <lkp@intel.com> > Reported-by: Dan Carpenter <error27@gmail.com> > Closes: https://lore.kernel.org/r/202305110245.MFxC9bUj-lkp@intel.com/ > Link: https://lore.kernel.org/r/202305110245.MFxC9bUj-lkp@intel.com/ > Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com> > Fixes: 7c1d1677b322 ("iio: accel: Support Kionix/ROHM KX022A accelerometer") > --- > drivers/iio/accel/kionix-kx022a.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/iio/accel/kionix-kx022a.c b/drivers/iio/accel/kionix-kx022a.c > index f98393d74666..b8636fa8eaeb 100644 > --- a/drivers/iio/accel/kionix-kx022a.c > +++ b/drivers/iio/accel/kionix-kx022a.c > @@ -1048,7 +1048,7 @@ int kx022a_probe_internal(struct device *dev) > data->ien_reg = KX022A_REG_INC4; > } else { > irq = fwnode_irq_get_byname(fwnode, "INT2"); > - if (irq <= 0) > + if (irq < 0) > return dev_err_probe(dev, irq, "No suitable IRQ\n"); > > data->inc_reg = KX022A_REG_INC5;
diff --git a/drivers/iio/accel/kionix-kx022a.c b/drivers/iio/accel/kionix-kx022a.c index f98393d74666..b8636fa8eaeb 100644 --- a/drivers/iio/accel/kionix-kx022a.c +++ b/drivers/iio/accel/kionix-kx022a.c @@ -1048,7 +1048,7 @@ int kx022a_probe_internal(struct device *dev) data->ien_reg = KX022A_REG_INC4; } else { irq = fwnode_irq_get_byname(fwnode, "INT2"); - if (irq <= 0) + if (irq < 0) return dev_err_probe(dev, irq, "No suitable IRQ\n"); data->inc_reg = KX022A_REG_INC5;
The fwnode_irq_get_byname() was returning 0 at device-tree mapping error. If this occurred, the KX022A driver did abort the probe but errorneously directly returned the return value from fwnode_irq_get_byname() from probe. In case of a device-tree mapping error this indicated success. The fwnode_irq_get_byname() has since been fixed to not return zero on error so the check for fwnode_irq_get_byname() can be relaxed to only treat negative values as errors. This will also do decent fix even when backported to branches where fwnode_irq_get_byname() can still return zero on error because KX022A probe should later fail at IRQ requesting and a prober error handling should follow. Relax the return value check for fwnode_irq_get_byname() to only treat negative values as errors. Reported-by: kernel test robot <lkp@intel.com> Reported-by: Dan Carpenter <error27@gmail.com> Closes: https://lore.kernel.org/r/202305110245.MFxC9bUj-lkp@intel.com/ Link: https://lore.kernel.org/r/202305110245.MFxC9bUj-lkp@intel.com/ Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com> Fixes: 7c1d1677b322 ("iio: accel: Support Kionix/ROHM KX022A accelerometer") --- drivers/iio/accel/kionix-kx022a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)