summaryrefslogtreecommitdiff
path: root/drivers/nfc/port100.c
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2019-12-12 01:32:01 +0300
committerJoel Stanley <joel@jms.id.au>2019-12-12 01:32:06 +0300
commitfdc60468f3e452364d432f1a7c3f83d58bba1b84 (patch)
treede7197f150958ae72cb87b6cf4885610f3edd704 /drivers/nfc/port100.c
parent20572eecd7248b66d855a8e4812debd9f828ccba (diff)
parent8539dfa4fcbcf58c3c2f92ac57b964add884d12b (diff)
downloadlinux-dev-5.3.tar.xz
Merge tag 'v5.3.15' into dev-5.3dev-5.3
This is the 5.3.15 stable release Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/nfc/port100.c')
-rw-r--r--drivers/nfc/port100.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/port100.c b/drivers/nfc/port100.c
index 145ddf3f0a45..604dba4f18af 100644
--- a/drivers/nfc/port100.c
+++ b/drivers/nfc/port100.c
@@ -783,7 +783,7 @@ static int port100_send_frame_async(struct port100 *dev, struct sk_buff *out,
rc = port100_submit_urb_for_ack(dev, GFP_KERNEL);
if (rc)
- usb_unlink_urb(dev->out_urb);
+ usb_kill_urb(dev->out_urb);
exit:
mutex_unlock(&dev->out_urb_lock);