diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-03 14:24:46 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-03 14:24:46 -0400 |
| commit | 447a8b858e4bda41c394b1bc7fdbc9dc0bdf44f6 (patch) | |
| tree | 676e741f2552c9cb301e1e49c557b92bf8940f55 /drivers/net/wireless/orinoco/orinoco_usb.c | |
| parent | 3049683eafdbbbd7350b0e5ca02a2d8c026a3362 (diff) | |
| parent | 042e1c79166b9250edd8262bea84e1703f27ad2e (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.18.
Diffstat (limited to 'drivers/net/wireless/orinoco/orinoco_usb.c')
| -rw-r--r-- | drivers/net/wireless/orinoco/orinoco_usb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c index c90939ced0e4..d3cf7c3ebfd6 100644 --- a/drivers/net/wireless/orinoco/orinoco_usb.c +++ b/drivers/net/wireless/orinoco/orinoco_usb.c | |||
| @@ -921,7 +921,6 @@ static int ezusb_access_ltv(struct ezusb_priv *upriv, | |||
| 921 | retval = -EFAULT; | 921 | retval = -EFAULT; |
| 922 | } | 922 | } |
| 923 | goto exit; | 923 | goto exit; |
| 924 | break; | ||
| 925 | } | 924 | } |
| 926 | if (ctx->in_rid) { | 925 | if (ctx->in_rid) { |
| 927 | struct ezusb_packet *ans = ctx->buf; | 926 | struct ezusb_packet *ans = ctx->buf; |