Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fdcf66e authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Greg Kroah-Hartman
Browse files

nfc: port100: fix using -ERRNO as command type mask 



commit 2195f2062e4cc93870da8e71c318ef98a1c51cef upstream.

During probing, the driver tries to get a list (mask) of supported
command types in port100_get_command_type_mask() function.  The value
is u64 and 0 is treated as invalid mask (no commands supported).  The
function however returns also -ERRNO as u64 which will be interpret as
valid command mask.

Return 0 on every error case of port100_get_command_type_mask(), so the
probing will stop.

Cc: <stable@vger.kernel.org>
Fixes: 0347a6ab ("NFC: port100: Commands mechanism implementation")
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 853f2262

drivers/nfc/port100.c

+2 −2
Original line number Diff line number Diff line
@@ -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;