summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorThomas Pugliese <thomas.pugliese@gmail.com>2013-10-23 14:44:29 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-29 16:44:49 -0700
commitf74b75e7f920c700636cccca669c7d16d12e9202 (patch)
tree65428b3ee5c3303a7c0ccce2a34a326fd67931b6 /drivers/usb
parentf07ddb9ef5c25c1044ab5b6509241320fb5e831a (diff)
downloadblackbird-op-linux-f74b75e7f920c700636cccca669c7d16d12e9202.tar.gz
blackbird-op-linux-f74b75e7f920c700636cccca669c7d16d12e9202.zip
usb: wusbcore: change WA_SEGS_MAX to a legal value
change WA_SEGS_MAX to a number that is legal according to the WUSB spec. Signed-off-by: Thomas Pugliese <thomas.pugliese@gmail.com> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/wusbcore/wa-xfer.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
index 090ac308c756..ed5abe87b049 100644
--- a/drivers/usb/wusbcore/wa-xfer.c
+++ b/drivers/usb/wusbcore/wa-xfer.c
@@ -91,7 +91,8 @@
#include "wusbhc.h"
enum {
- WA_SEGS_MAX = 255,
+ /* [WUSB] section 8.3.3 allocates 7 bits for the segment index. */
+ WA_SEGS_MAX = 128,
};
enum wa_seg_status {
@@ -588,7 +589,7 @@ static ssize_t __wa_xfer_setup_sizes(struct wa_xfer *xfer,
xfer->segs = 1;
}
- if (xfer->segs >= WA_SEGS_MAX) {
+ if (xfer->segs > WA_SEGS_MAX) {
dev_err(dev, "BUG? oops, number of segments %zu bigger than %d\n",
(urb->transfer_buffer_length/xfer->seg_size),
WA_SEGS_MAX);
OpenPOWER on IntegriCloud