diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-12-01 01:02:04 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-12-01 01:02:04 +0800 |
| commit | 0f646885c342e74051e3d40acd40af310469526d (patch) | |
| tree | d584727a1b291b524f5dde014725c53baa02b5f1 /net/nfc | |
| parent | 00236b01de65d53e3cde74900c7b0be059abcf6b (diff) | |
| parent | 81ab793d6dcb61c8ca908b442cc7b98be7ffa02c (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'net/nfc')
| -rw-r--r-- | net/nfc/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/core.c b/net/nfc/core.c index c5a2c7e733b3..1471e4b0aa2c 100644 --- a/net/nfc/core.c +++ b/net/nfc/core.c @@ -1093,7 +1093,7 @@ struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops, err_free_dev: kfree(dev); - return ERR_PTR(rc); + return NULL; } EXPORT_SYMBOL(nfc_allocate_device); |