diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 04:38:34 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 04:38:34 (GMT) |
| commit | 37aa48368f2508defb1976be62e1ed6ca4dde683 (patch) | |
| tree | 59b606c740ddd10259fbf2248bb50498a319fa6d /drivers/usb/gadget/zero.c | |
| parent | 1da4f83c0c43f25baf356c4cc719255877da6b1e (diff) | |
| parent | d1db0eea852497762cab43b905b879dfcd3b8987 (diff) | |
| download | linux-37aa48368f2508defb1976be62e1ed6ca4dde683.tar.xz | |
Merge 3.15-rc3 into staging-next
Diffstat (limited to 'drivers/usb/gadget/zero.c')
| -rw-r--r-- | drivers/usb/gadget/zero.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c index 9f170c5..134f354 100644 --- a/drivers/usb/gadget/zero.c +++ b/drivers/usb/gadget/zero.c @@ -300,7 +300,7 @@ static int __init zero_bind(struct usb_composite_dev *cdev) ss_opts->isoc_interval = gzero_options.isoc_interval; ss_opts->isoc_maxpacket = gzero_options.isoc_maxpacket; ss_opts->isoc_mult = gzero_options.isoc_mult; - ss_opts->isoc_maxburst = gzero_options.isoc_maxpacket; + ss_opts->isoc_maxburst = gzero_options.isoc_maxburst; ss_opts->bulk_buflen = gzero_options.bulk_buflen; func_ss = usb_get_function(func_inst_ss); |