diff options
| author | Denys Drozdov <denys.drozdov@toradex.com> | 2022-01-10 14:20:03 +0200 |
|---|---|---|
| committer | Denys Drozdov <denys.drozdov@toradex.com> | 2022-01-10 14:20:03 +0200 |
| commit | 4bb86062b45ca43f536131c4f3d02ecd9ad66eca (patch) | |
| tree | 40ad320a8e600e1ee74ee3723ea2c6b0890ad5a2 /drivers/nfc/port100.c | |
| parent | c1d2a6fa7e3635a0ac4e2a7cbe7ccbc2059b6968 (diff) | |
| parent | e6de9a8b5b30ebbc4d96df447ddee3202f1b4daf (diff) | |
Merge tag 'v5.4.157' into HEAD
This is the 5.4.157 stable release
Diffstat (limited to 'drivers/nfc/port100.c')
| -rw-r--r-- | drivers/nfc/port100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nfc/port100.c b/drivers/nfc/port100.c index 8e4d355dc3ae..1caebefb25ff 100644 --- a/drivers/nfc/port100.c +++ b/drivers/nfc/port100.c @@ -1003,11 +1003,11 @@ static u64 port100_get_command_type_mask(struct port100 *dev) skb = port100_alloc_skb(dev, 0); if (!skb) - return -ENOMEM; + return 0; resp = port100_send_cmd_sync(dev, PORT100_CMD_GET_COMMAND_TYPE, skb); if (IS_ERR(resp)) - return PTR_ERR(resp); + return 0; if (resp->len < 8) mask = 0; |