diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-28 11:00:55 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-28 11:00:55 -0700 |
| commit | 02d5f0857bc2962625fa2d34957d43a9e3175eb4 (patch) | |
| tree | 1146b3a025f8257a99b9a02eb62a4e338bb6ec01 /drivers/usb/host/ehci-sched.c | |
| parent | 659597b77493959c699b4e99841a2c778eaa70bc (diff) | |
| parent | 482b0b5d82bd916cc0c55a2abf65bdc69023b843 (diff) | |
| download | linux-stable-02d5f0857bc2962625fa2d34957d43a9e3175eb4.tar.gz linux-stable-02d5f0857bc2962625fa2d34957d43a9e3175eb4.tar.bz2 linux-stable-02d5f0857bc2962625fa2d34957d43a9e3175eb4.zip | |
Merge branch 'usb-linus' into usb-next
This lets us fix the build error that happens when these two trees are merged
together.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ehci-sched.c')
| -rw-r--r-- | drivers/usb/host/ehci-sched.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c index c833febf8df0..acff5b8f6e89 100644 --- a/drivers/usb/host/ehci-sched.c +++ b/drivers/usb/host/ehci-sched.c @@ -1206,6 +1206,7 @@ itd_urb_transaction ( memset (itd, 0, sizeof *itd); itd->itd_dma = itd_dma; + itd->frame = 9999; /* an invalid value */ list_add (&itd->itd_list, &sched->td_list); } spin_unlock_irqrestore (&ehci->lock, flags); @@ -1907,6 +1908,7 @@ sitd_urb_transaction ( memset (sitd, 0, sizeof *sitd); sitd->sitd_dma = sitd_dma; + sitd->frame = 9999; /* an invalid value */ list_add (&sitd->sitd_list, &iso_sched->td_list); } |