xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net

Browse Source
This commit is contained in:
David S. Miller
2020-01-19 22:10:04 +01:00
parent 4ee9e6e027 7008ee1210
commit b3f7e3f23a
406 changed files with 3094 additions and 2611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/nfc/pn533/usb.c
View File

@@ -391,7 +391,7 @@ static int pn533_acr122_poweron_rdr(struct pn533_usb_phy *phy)
cmd, sizeof(cmd), false);
rc = usb_bulk_msg(phy->udev, phy->out_urb->pipe, buffer, sizeof(cmd),
&transferred, 0);
&transferred, 5000);
kfree(buffer);
if (rc || (transferred != sizeof(cmd))) {
nfc_err(&phy->udev->dev,