Skip to content

Commit

Permalink
Revert "CHROMIUM: usb: gadget: f_fs: Fix kernel panic for SuperSpeed"
Browse files Browse the repository at this point in the history
This reverts commit 6538654.

BUG=b/28609271
TEST=No boot loop on switching to recovery/factory wipe.

Change-Id: I67ab8c0a509ed0827a6892adf4390ca82830785b
Reviewed-on: https://chromium-review.googlesource.com/342833
Reviewed-by: Stephen Barber <smbarber@chromium.org>
Commit-Queue: Stephen Barber <smbarber@chromium.org>
Tested-by: Stephen Barber <smbarber@chromium.org>
  • Loading branch information
Benson Leung authored and ChromeOS Commit Bot committed May 6, 2016
1 parent ca42956 commit 933cb6e
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/usb/gadget/function/f_fs.c
Original file line number Diff line number Diff line change
Expand Up @@ -2062,7 +2062,8 @@ static int __ffs_data_do_os_desc(enum ffs_os_desc_type type,
int i;

if (len < sizeof(*d) ||
d->bFirstInterfaceNumber >= ffs->interfaces_count)
d->bFirstInterfaceNumber >= ffs->interfaces_count ||
d->Reserved1)
return -EINVAL;
for (i = 0; i < ARRAY_SIZE(d->Reserved2); ++i)
if (d->Reserved2[i])
Expand Down

0 comments on commit 933cb6e

Please sign in to comment.