diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-21 09:05:00 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-21 09:05:00 -0700 |
| commit | f43393ffe800ffe4544da2f0a8e09d0b3ff3395e (patch) | |
| tree | 894efae37f47432bc36f39c4740a4e7866e7a406 /usb.current | |
| parent | 5f6525ffbd138c2c0387e3711dc332c4f51bb00b (diff) | |
| download | patches-f43393ffe800ffe4544da2f0a8e09d0b3ff3395e.tar.gz | |
more bugfixes
Diffstat (limited to 'usb.current')
| -rw-r--r-- | usb.current/musb-fix-index-register-corruption-seen-with-g_ether-and-windows-host.patch | 50 | ||||
| -rw-r--r-- | usb.current/usb-sisusbvga-add-usb-id-for-0711-0918-magic-control-technology-corp.patch | 37 |
2 files changed, 87 insertions, 0 deletions
diff --git a/usb.current/musb-fix-index-register-corruption-seen-with-g_ether-and-windows-host.patch b/usb.current/musb-fix-index-register-corruption-seen-with-g_ether-and-windows-host.patch new file mode 100644 index 00000000000000..35a9879793bdfa --- /dev/null +++ b/usb.current/musb-fix-index-register-corruption-seen-with-g_ether-and-windows-host.patch @@ -0,0 +1,50 @@ +From gadiyar@ti.com Thu Aug 21 08:40:33 2008 +From: "Gadiyar, Anand" <gadiyar@ti.com> +Date: Thu, 21 Aug 2008 20:21:00 +0530 +Subject: MUSB: Fix index register corruption seen with g_ether and Windows host +To: "greg@kroah.com" <greg@kroah.com>, "linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org> +Cc: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>, "felipe.balbi@nokia.com" <felipe.balbi@nokia.com>, Tony Lindgren <tony@atomide.com> +Message-ID: <5A47E75E594F054BAF48C5E4FC4B92AB02C3E31565@dbde02.ent.ti.com> + + +From: Anand Gadiyar <gadiyar@ti.com> + +If Indexed Mode register accesses are enabled, the ep0_rxstate() +function calls musb_g_ep0_giveback() before writing to the CSR +register. When control returns to this ep0_rxstate, the index +register contents are over-written. This causes the CSR register +write to fail. + +Fixed by writing the correct value into the index register before +writing to the CSR. + +This was observed only in ep0_rxstate() with g_ether loaded and +the device connected to a MS Windows host PC. Anticipatively fixed +ep0_txstate() as well. + +Signed-off-by: Anand Gadiyar <gadiyar@ti.com> +Acked-by: Felipe Balbi <felipe.balbi@nokia.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/musb/musb_gadget_ep0.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/usb/musb/musb_gadget_ep0.c ++++ b/drivers/usb/musb/musb_gadget_ep0.c +@@ -476,6 +476,7 @@ static void ep0_rxstate(struct musb *mus + return; + musb->ackpend = 0; + } ++ musb_ep_select(musb->mregs, 0); + musb_writew(regs, MUSB_CSR0, tmp); + } + +@@ -528,6 +529,7 @@ static void ep0_txstate(struct musb *mus + } + + /* send it out, triggering a "txpktrdy cleared" irq */ ++ musb_ep_select(musb->mregs, 0); + musb_writew(regs, MUSB_CSR0, csr); + } + diff --git a/usb.current/usb-sisusbvga-add-usb-id-for-0711-0918-magic-control-technology-corp.patch b/usb.current/usb-sisusbvga-add-usb-id-for-0711-0918-magic-control-technology-corp.patch new file mode 100644 index 00000000000000..b9ec93b4ad4381 --- /dev/null +++ b/usb.current/usb-sisusbvga-add-usb-id-for-0711-0918-magic-control-technology-corp.patch @@ -0,0 +1,37 @@ +From s.L-H@gmx.de Thu Aug 21 08:50:46 2008 +From: Stefan Lippers-Hollmann <s.L-H@gmx.de> +Date: Thu, 21 Aug 2008 13:46:11 +0200 +Subject: USB: sisusbvga: add USB ID for 0711:0918 Magic Control Technology Corp. +To: Thomas Winischhofer <thomas@winischhofer.net> +Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org +Message-ID: <200808211346.13628.s.L-H@gmx.de> +Content-Disposition: inline + + +sisusbvga: add USB ID for 0711:0918 Magic Control Technology Corp. + +usb 1-2: new high speed USB device using ehci_hcd and address 4 +usb 1-2: configuration #1 chosen from 1 choice +usb 1-2: USB2VGA dongle found at address 4 +usb 1-2: Allocated 8 output buffers +usb 1-2: 8MB 1 ch/1 r SDR SDRAM, bus width 32 +usb 1-2: New USB device found, idVendor=0711, idProduct=0918 +usb 1-2: New USB device strings: Mfr=0, Product=0, SerialNumber=0 + +Signed-off-by: Stefan Lippers-Hollmann <s.L-H@gmx.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/misc/sisusbvga/sisusb.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/usb/misc/sisusbvga/sisusb.c ++++ b/drivers/usb/misc/sisusbvga/sisusb.c +@@ -3270,6 +3270,7 @@ static struct usb_device_id sisusb_table + { USB_DEVICE(0x0711, 0x0900) }, + { USB_DEVICE(0x0711, 0x0901) }, + { USB_DEVICE(0x0711, 0x0902) }, ++ { USB_DEVICE(0x0711, 0x0918) }, + { USB_DEVICE(0x182d, 0x021c) }, + { USB_DEVICE(0x182d, 0x0269) }, + { } |