hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NFC: st21nfca: Report error returned by functions instead of -ENODEV 

Report error returned by devm_gpio_request_one or
st21nfca_hci_platform_init instead of -ENODEV.

Reported-by: Dmitry Torokhov <dtor@chromium.org>
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Christophe Ricard 2014-12-02 21:27:55 +01:00 committed by Samuel Ortiz
parent b3a55b9c5d
commit 67df3f9509
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/nfc/st21nfca/i2c.c
View File

@ -530,7 +530,7 @@ static int st21nfca_hci_i2c_of_request_resources(struct i2c_client *client)
"clf_enable"); "clf_enable");
if (r) { if (r) {
nfc_err(&client->dev, "Failed to request enable pin\n"); nfc_err(&client->dev, "Failed to request enable pin\n");
return -ENODEV; return r;
} }
phy->gpio_ena = gpio; phy->gpio_ena = gpio;
@ -567,7 +567,7 @@ static int st21nfca_hci_i2c_request_resources(struct i2c_client *client)
GPIOF_OUT_INIT_HIGH, "clf_enable"); GPIOF_OUT_INIT_HIGH, "clf_enable");
if (r) { if (r) {
pr_err("%s : ena gpio_request failed\n", __FILE__); pr_err("%s : ena gpio_request failed\n", __FILE__);
return -ENODEV; return r;
} }
} }
@ -628,7 +628,7 @@ static int st21nfca_hci_i2c_probe(struct i2c_client *client,
r = st21nfca_hci_platform_init(phy); r = st21nfca_hci_platform_init(phy);
if (r < 0) { if (r < 0) {
nfc_err(&client->dev, "Unable to reboot st21nfca\n"); nfc_err(&client->dev, "Unable to reboot st21nfca\n");
return -ENODEV; return r;
} }
r = devm_request_threaded_irq(&client->dev, client->irq, NULL, r = devm_request_threaded_irq(&client->dev, client->irq, NULL,