]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
nfc: st21nfca: Fix static checker warning
authorChristophe Ricard <christophe.ricard@gmail.com>
Sat, 30 Apr 2016 07:12:34 +0000 (09:12 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 1 Jun 2016 19:16:58 +0000 (12:16 -0700)
commit b58afe6d6d3a53af165d5946f12c4b08c95acd58 upstream.

Fix static checker warning:
drivers/nfc/st21nfca/i2c.c:530 st21nfca_hci_i2c_acpi_request_resources()
error: 'gpiod_ena' dereferencing possible ERR_PTR()

Fix so that if no enable gpio can be retrieved an -ENODEV is returned.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: dfa8070d7f64 ("nfc: st21nfca: Add support for acpi probing for i2c device.")
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/nfc/st21nfca/i2c.c

index 1f44a151d20616b21a148b6d9d8b070d54089201..d5a099b022e4f1beaa631b7ee1a86fbb7781266b 100644 (file)
@@ -524,8 +524,10 @@ static int st21nfca_hci_i2c_acpi_request_resources(struct i2c_client *client)
        /* Get EN GPIO from ACPI */
        gpiod_ena = devm_gpiod_get_index(dev, ST21NFCA_GPIO_NAME_EN, 1,
                                         GPIOD_OUT_LOW);
-       if (!IS_ERR(gpiod_ena))
-               phy->gpio_ena = desc_to_gpio(gpiod_ena);
+       if (!IS_ERR(gpiod_ena)) {
+               nfc_err(dev, "Unable to get ENABLE GPIO\n");
+               return -ENODEV;
+       }
 
        phy->gpio_ena = desc_to_gpio(gpiod_ena);