2013-05-07 12:07:53

by Wei Yongjun

Subject: [PATCH] NFC: pn533: fix error return code in pn533_probe()

From: Wei Yongjun <[email protected]>

Fix to return -ENOMEM in the nfc device alloc error handling
case instead of 0, as done elsewhere in this function.

Signed-off-by: Wei Yongjun <[email protected]>
---
drivers/nfc/pn533.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index 8f6f2ba..0bdfa88 100644
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -2783,8 +2783,10 @@ static int pn533_probe(struct usb_interface *interface,
dev->ops->tx_header_len +
PN533_CMD_DATAEXCH_HEAD_LEN,
dev->ops->tx_tail_len);
- if (!dev->nfc_dev)
+ if (!dev->nfc_dev) {
+ rc = -ENOMEM;
goto destroy_wq;
+ }

nfc_set_parent_dev(dev->nfc_dev, &interface->dev);
nfc_set_drvdata(dev->nfc_dev, dev);

2013-05-16 22:16:18

by Samuel Ortiz

Subject: Re: [PATCH] NFC: pn533: fix error return code in pn533_probe()

Hi Wei,

On Tue, May 07, 2013 at 08:07:52PM +0800, Wei Yongjun wrote:
> From: Wei Yongjun <[email protected]>
>
> Fix to return -ENOMEM in the nfc device alloc error handling
> case instead of 0, as done elsewhere in this function.
>
> Signed-off-by: Wei Yongjun <[email protected]>
> ---
> drivers/nfc/pn533.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
Applied to nfc-next, thanks.

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/