diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-11-21 10:56:25 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-11-21 10:56:25 -0800 |
| commit | 84dc474f3c33c4fbbe42f46876e0dde502e60ad0 (patch) | |
| tree | 1c60e8369668a67042e47774ae4a389bbfc239b6 /drivers/misc | |
| parent | 40ceb2c69964f8bde97d4ded4306508db16fd365 (diff) | |
| parent | 4eb9a81002485a7abfa53a334dde5bc10328079f (diff) | |
Merge tag 'v4.4.34' into android-4.4.y
This is the 4.4.34 stable release
Change-Id: Ic90323945584a7173f54595e0482d26fafd10174
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/mei/bus-fixup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/mei/bus-fixup.c b/drivers/misc/mei/bus-fixup.c index 020de5919c21..bdc7fcd80eca 100644 --- a/drivers/misc/mei/bus-fixup.c +++ b/drivers/misc/mei/bus-fixup.c @@ -151,7 +151,7 @@ static int mei_nfc_if_version(struct mei_cl *cl, ret = 0; bytes_recv = __mei_cl_recv(cl, (u8 *)reply, if_version_length); - if (bytes_recv < 0 || bytes_recv < sizeof(struct mei_nfc_reply)) { + if (bytes_recv < if_version_length) { dev_err(bus->dev, "Could not read IF version\n"); ret = -EIO; goto err; |