diff options
author | Christophe Ricard <christophe.ricard@gmail.com> | 2014-12-02 15:27:56 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2014-12-02 16:49:11 -0500 |
commit | 18159624d85f260bdb19d79eb78d58fb17f76181 (patch) | |
tree | 87111398259e58896fd4235a7e8c8354913fa2e0 /drivers | |
parent | 67df3f9509b15fc29ba8c110b25f4913efa318d4 (diff) |
NFC: st21nfcb: Fix reported error
Report error returned by devm_gpio_request_one 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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/nfc/st21nfcb/i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nfc/st21nfcb/i2c.c b/drivers/nfc/st21nfcb/i2c.c index 363c2fc6f816..01ba865863ee 100644 --- a/drivers/nfc/st21nfcb/i2c.c +++ b/drivers/nfc/st21nfcb/i2c.c | |||
@@ -255,7 +255,7 @@ static int st21nfcb_nci_i2c_of_request_resources(struct i2c_client *client) | |||
255 | GPIOF_OUT_INIT_HIGH, "clf_reset"); | 255 | GPIOF_OUT_INIT_HIGH, "clf_reset"); |
256 | if (r) { | 256 | if (r) { |
257 | nfc_err(&client->dev, "Failed to request reset pin\n"); | 257 | nfc_err(&client->dev, "Failed to request reset pin\n"); |
258 | return -ENODEV; | 258 | return r; |
259 | } | 259 | } |
260 | phy->gpio_reset = gpio; | 260 | phy->gpio_reset = gpio; |
261 | 261 | ||
@@ -290,7 +290,7 @@ static int st21nfcb_nci_i2c_request_resources(struct i2c_client *client) | |||
290 | phy->gpio_reset, GPIOF_OUT_INIT_HIGH, "clf_reset"); | 290 | phy->gpio_reset, GPIOF_OUT_INIT_HIGH, "clf_reset"); |
291 | if (r) { | 291 | if (r) { |
292 | pr_err("%s : reset gpio_request failed\n", __FILE__); | 292 | pr_err("%s : reset gpio_request failed\n", __FILE__); |
293 | return -ENODEV; | 293 | return r; |
294 | } | 294 | } |
295 | 295 | ||
296 | return 0; | 296 | return 0; |