| Message ID | 46566e85-4afa-4c55-93b2-0d0b71d76b12@moroto.mountain |
|---|---|
| State | Accepted |
| Commit | c8fb5a52b977ef91dc9342e556c63b9602065c8a |
| Headers | show |
| Series | gpio: rtd: Fix signedness bug in probe | expand |
On Fri, Jan 12, 2024 at 7:55 AM Dan Carpenter <dan.carpenter@linaro.org> wrote: > > The "data->irqs[]" array holds unsigned int so this error handling will > not work correctly. > > Fixes: eee636bff0dc ("gpio: rtd: Add support for Realtek DHC(Digital Home Center) RTD SoCs") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > --- > drivers/gpio/gpio-rtd.c | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpio/gpio-rtd.c b/drivers/gpio/gpio-rtd.c > index a7939bd0aa56..bf7f008f58d7 100644 > --- a/drivers/gpio/gpio-rtd.c > +++ b/drivers/gpio/gpio-rtd.c > @@ -525,18 +525,21 @@ static int rtd_gpio_probe(struct platform_device *pdev) > struct device *dev = &pdev->dev; > struct gpio_irq_chip *irq_chip; > struct rtd_gpio *data; > + int ret; > > data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); > if (!data) > return -ENOMEM; > > - data->irqs[0] = platform_get_irq(pdev, 0); > - if (data->irqs[0] < 0) > - return data->irqs[0]; > + ret = platform_get_irq(pdev, 0); > + if (ret < 0) > + return ret; > + data->irqs[0] = ret; > > - data->irqs[1] = platform_get_irq(pdev, 1); > - if (data->irqs[1] < 0) > - return data->irqs[1]; > + ret = platform_get_irq(pdev, 1); > + if (ret < 0) > + return ret; > + data->irqs[1] = ret; > > data->info = device_get_match_data(dev); > if (!data->info) > -- > 2.43.0 > Applied, thanks! Bartosz
diff --git a/drivers/gpio/gpio-rtd.c b/drivers/gpio/gpio-rtd.c index a7939bd0aa56..bf7f008f58d7 100644 --- a/drivers/gpio/gpio-rtd.c +++ b/drivers/gpio/gpio-rtd.c @@ -525,18 +525,21 @@ static int rtd_gpio_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct gpio_irq_chip *irq_chip; struct rtd_gpio *data; + int ret; data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); if (!data) return -ENOMEM; - data->irqs[0] = platform_get_irq(pdev, 0); - if (data->irqs[0] < 0) - return data->irqs[0]; + ret = platform_get_irq(pdev, 0); + if (ret < 0) + return ret; + data->irqs[0] = ret; - data->irqs[1] = platform_get_irq(pdev, 1); - if (data->irqs[1] < 0) - return data->irqs[1]; + ret = platform_get_irq(pdev, 1); + if (ret < 0) + return ret; + data->irqs[1] = ret; data->info = device_get_match_data(dev); if (!data->info)
The "data->irqs[]" array holds unsigned int so this error handling will not work correctly. Fixes: eee636bff0dc ("gpio: rtd: Add support for Realtek DHC(Digital Home Center) RTD SoCs") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- drivers/gpio/gpio-rtd.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)