diff options
author | Christophe Ricard <christophe.ricard@gmail.com> | 2014-12-02 15:27:55 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2014-12-02 16:48:32 -0500 |
commit | 67df3f9509b15fc29ba8c110b25f4913efa318d4 (patch) | |
tree | 7df33ed33034072987be22ea946cef1eb5c3edff /drivers/nfc | |
parent | b3a55b9c5d44d0ed38eb6e8593a47578801730de (diff) |
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>
Diffstat (limited to 'drivers/nfc')
-rw-r--r-- | drivers/nfc/st21nfca/i2c.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c index 44e1c769e335..05722085a59f 100644 --- a/drivers/nfc/st21nfca/i2c.c +++ b/drivers/nfc/st21nfca/i2c.c | |||
@@ -530,7 +530,7 @@ static int st21nfca_hci_i2c_of_request_resources(struct i2c_client *client) | |||
530 | "clf_enable"); | 530 | "clf_enable"); |
531 | if (r) { | 531 | if (r) { |
532 | nfc_err(&client->dev, "Failed to request enable pin\n"); | 532 | nfc_err(&client->dev, "Failed to request enable pin\n"); |
533 | return -ENODEV; | 533 | return r; |
534 | } | 534 | } |
535 | 535 | ||
536 | phy->gpio_ena = gpio; | 536 | phy->gpio_ena = gpio; |
@@ -567,7 +567,7 @@ static int st21nfca_hci_i2c_request_resources(struct i2c_client *client) | |||
567 | GPIOF_OUT_INIT_HIGH, "clf_enable"); | 567 | GPIOF_OUT_INIT_HIGH, "clf_enable"); |
568 | if (r) { | 568 | if (r) { |
569 | pr_err("%s : ena gpio_request failed\n", __FILE__); | 569 | pr_err("%s : ena gpio_request failed\n", __FILE__); |
570 | return -ENODEV; | 570 | return r; |
571 | } | 571 | } |
572 | } | 572 | } |
573 | 573 | ||
@@ -628,7 +628,7 @@ static int st21nfca_hci_i2c_probe(struct i2c_client *client, | |||
628 | r = st21nfca_hci_platform_init(phy); | 628 | r = st21nfca_hci_platform_init(phy); |
629 | if (r < 0) { | 629 | if (r < 0) { |
630 | nfc_err(&client->dev, "Unable to reboot st21nfca\n"); | 630 | nfc_err(&client->dev, "Unable to reboot st21nfca\n"); |
631 | return -ENODEV; | 631 | return r; |
632 | } | 632 | } |
633 | 633 | ||
634 | r = devm_request_threaded_irq(&client->dev, client->irq, NULL, | 634 | r = devm_request_threaded_irq(&client->dev, client->irq, NULL, |