Skip to contentSkip to conversation

Patch "nfc: st21nfca: Fix static checker warning" has been added to the 4.6-stable tree

PATCH [email protected] 1 participant 1 message May 29, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

nfc: st21nfca: Fix static checker warning

to the 4.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
nfc-st21nfca-fix-static-checker-warning.patch
and it can be found in the queue-4.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From b58afe6d6d3a53af165d5946f12c4b08c95acd58 Mon Sep 17 00:00:00 2001

From: Christophe Ricard <[email protected]>
Date: Sat, 30 Apr 2016 09:12:34 +0200
Subject: nfc: st21nfca: Fix static checker warning

From: Christophe Ricard <[email protected]>

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.

Fixes dfa8070d7f64 ("nfc: st21nfca: Add support for acpi probing for i2c device.")
---
 drivers/nfc/st21nfca/i2c.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/nfc/st21nfca/i2c.c +4 -2
@@ -524,8 +524,10 @@ static int st21nfca_hci_i2c_acpi_request
 	/* 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);
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.6/nfc-st21nfca-fix-static-checker-warning.patch