mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge 4.9-rc5 into char-misc-next
We want those fixes in here as well. Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
commit
b7d91c9152
681 changed files with 7662 additions and 4827 deletions
|
|
@ -133,7 +133,7 @@ static int mei_nfc_if_version(struct nfc_mei_phy *phy)
|
|||
return -ENOMEM;
|
||||
|
||||
bytes_recv = mei_cldev_recv(phy->cldev, (u8 *)reply, if_version_length);
|
||||
if (bytes_recv < 0 || bytes_recv < sizeof(struct mei_nfc_reply)) {
|
||||
if (bytes_recv < 0 || bytes_recv < if_version_length) {
|
||||
pr_err("Could not read IF version\n");
|
||||
r = -EIO;
|
||||
goto err;
|
||||
|
|
|
|||
Loading…
Reference in a new issue