Merge remote-tracking branch 'stable/linux-5.15.y' into rpi-5.15.y

[platform/kernel/linux-rpi.git] / drivers / nfc / port100.c

diff --git a/drivers/nfc/port100.c b/drivers/nfc/port100.c
index 517376c..90e30e2 100644 (file)
--- a/drivers/nfc/port100.c
+++ b/drivers/nfc/port100.c
@@ -1006,11 +1006,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;
@@ -1612,7 +1612,9 @@ free_nfc_dev:
        nfc_digital_free_device(dev->nfc_digital_dev);
 
 error:
+       usb_kill_urb(dev->in_urb);
        usb_free_urb(dev->in_urb);
+       usb_kill_urb(dev->out_urb);
        usb_free_urb(dev->out_urb);
        usb_put_dev(dev->udev);