summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2012-01-13 19:04:17 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2012-01-24 14:30:23 -0800
commit2851784f4d820bc697a8cc608509f9e3975c80e5 (patch)
tree5d2be93cdaef4a56e41641cca0abcd0b834a6a5f
parent98d9a82e5f753a2483d7b4638802d60e94e5d2e4 (diff)
downloadtalos-op-linux-2851784f4d820bc697a8cc608509f9e3975c80e5.tar.gz
talos-op-linux-2851784f4d820bc697a8cc608509f9e3975c80e5.zip
usb/uhci: initialize sg_table properly
Commit 689d6eac ("USB: UHCI: add native scatter-gather support(v1)) added sg support to uhci but forgot to set the sg_table so this feature remained unused. Cc: Ming Lei <tom.leiming@gmail.com> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/host/uhci-hcd.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index 6b5eb1017e2c..e37dea87bb56 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -565,6 +565,9 @@ static int uhci_start(struct usb_hcd *hcd)
struct dentry __maybe_unused *dentry;
hcd->uses_new_polling = 1;
+ /* Accept arbitrarily long scatter-gather lists */
+ if (!(hcd->driver->flags & HCD_LOCAL_MEM))
+ hcd->self.sg_tablesize = ~0;
spin_lock_init(&uhci->lock);
setup_timer(&uhci->fsbr_timer, uhci_fsbr_timeout,
OpenPOWER on IntegriCloud