diff options
| author | Christophe Ricard <christophe.ricard@gmail.com> | 2014-04-01 00:34:05 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2014-04-22 00:37:30 +0200 |
| commit | 9bac75d0eceb8d7fea74f11a8b304aa1119681f2 (patch) | |
| tree | c7c119c215042ffd3288440f3b81d32dfeef0903 /drivers/nfc | |
| parent | 761a2c4f90d6ea5a821050edccff13adc4a34fae (diff) | |
| download | linux-9bac75d0eceb8d7fea74f11a8b304aa1119681f2.tar.gz linux-9bac75d0eceb8d7fea74f11a8b304aa1119681f2.tar.bz2 linux-9bac75d0eceb8d7fea74f11a8b304aa1119681f2.zip | |
NFC: st21nfca: st21nfca_hci_i2c_probe returns st21nfca_hci_probe result.
st21nfca_hci_probe return 0 in case of successful call and a different
value in any other cases.
There is no need to check for st21nfca_hci_probe return as this will be
checked after st21nfca_hci_i2c_probe is completed.
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 | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c index 71becd9cb99d..aafe70e9abea 100644 --- a/drivers/nfc/st21nfca/i2c.c +++ b/drivers/nfc/st21nfca/i2c.c @@ -555,14 +555,9 @@ static int st21nfca_hci_i2c_probe(struct i2c_client *client, return r; } - r = st21nfca_hci_probe(phy, &i2c_phy_ops, LLC_SHDLC_NAME, + return st21nfca_hci_probe(phy, &i2c_phy_ops, LLC_SHDLC_NAME, ST21NFCA_FRAME_HEADROOM, ST21NFCA_FRAME_TAILROOM, ST21NFCA_HCI_LLC_MAX_PAYLOAD, &phy->hdev); - - if (r < 0) - return r; - - return 0; } static int st21nfca_hci_i2c_remove(struct i2c_client *client) |