more patches added

2 files changed, 144 insertions, 0 deletions

diff --git a/usb/usb-au1xx0-replace-casual-readl-with-au_readl-in-the-drivers.patch b/usb/usb-au1xx0-replace-casual-readl-with-au_readl-in-the-drivers.patch
new file mode 100644
index 0000000000000..15ad2bca79477
--- /dev/null
+++ b/usb/usb-au1xx0-replace-casual-readl-with-au_readl-in-the-drivers.patch
@@ -0,0 +1,90 @@
+From akpm@osdl.org Thu Jan  5 22:54:16 2006
+From: Sergei Shtylylov <sshtylyov@ru.mvista.com>
+Message-Id: <200601060650.k066op5a008830@shell0.pdx.osdl.net>
+Subject: USB: Au1xx0: replace casual readl() with au_readl() in the drivers
+To: greg@kroah.com
+Cc: akpm@osdl.org, sshtylyov@ru.mvista.com, jordan.crouse@amd.com, perex@perex.cz, tiwai@suse.de
+Date: Thu, 05 Jan 2006 22:50:39 -0800
+
+
+From: Sergei Shtylylov <sshtylyov@ru.mvista.com>
+
+au_readl() does needed byteswapping, etc.
+
+Cc: Takashi Iwai <tiwai@suse.de>
+Cc: Jaroslav Kysela <perex@perex.cz>
+Acked-by: Jordan Crouse <jordan.crouse@amd.com>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ drivers/usb/host/ohci-au1xxx.c |    2 +-
+ sound/oss/au1550_ac97.c        |   12 ++++++------
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+--- gregkh-2.6.orig/drivers/usb/host/ohci-au1xxx.c
++++ gregkh-2.6/drivers/usb/host/ohci-au1xxx.c
+@@ -67,7 +67,7 @@ static void au1xxx_stop_hc(struct platfo
+ 	       ": stopping Au1xxx OHCI USB Controller\n");
+ 
+ 	/* Disable clock */
+-	au_writel(readl((void *)USB_HOST_CONFIG) & ~USBH_ENABLE_CE, USB_HOST_CONFIG);
++	au_writel(au_readl(USB_HOST_CONFIG) & ~USBH_ENABLE_CE, USB_HOST_CONFIG);
+ }
+ 
+ 
+--- gregkh-2.6.orig/sound/oss/au1550_ac97.c
++++ gregkh-2.6/sound/oss/au1550_ac97.c
+@@ -462,7 +462,7 @@ stop_dac(struct au1550_state *s)
+ 	/* Wait for Transmit Busy to show disabled.
+ 	*/
+ 	do {
+-		stat = readl((void *)PSC_AC97STAT);
++		stat = au_readl(PSC_AC97STAT);
+ 		au_sync();
+ 	} while ((stat & PSC_AC97STAT_TB) != 0);
+ 
+@@ -491,7 +491,7 @@ stop_adc(struct au1550_state *s)
+ 	/* Wait for Receive Busy to show disabled.
+ 	*/
+ 	do {
+-		stat = readl((void *)PSC_AC97STAT);
++		stat = au_readl(PSC_AC97STAT);
+ 		au_sync();
+ 	} while ((stat & PSC_AC97STAT_RB) != 0);
+ 
+@@ -541,7 +541,7 @@ set_xmit_slots(int num_channels)
+ 	/* Wait for Device ready.
+ 	*/
+ 	do {
+-		stat = readl((void *)PSC_AC97STAT);
++		stat = au_readl(PSC_AC97STAT);
+ 		au_sync();
+ 	} while ((stat & PSC_AC97STAT_DR) == 0);
+ }
+@@ -573,7 +573,7 @@ set_recv_slots(int num_channels)
+ 	/* Wait for Device ready.
+ 	*/
+ 	do {
+-		stat = readl((void *)PSC_AC97STAT);
++		stat = au_readl(PSC_AC97STAT);
+ 		au_sync();
+ 	} while ((stat & PSC_AC97STAT_DR) == 0);
+ }
+@@ -1995,7 +1995,7 @@ au1550_probe(void)
+ 	/* Wait for PSC ready.
+ 	*/
+ 	do {
+-		val = readl((void *)PSC_AC97STAT);
++		val = au_readl(PSC_AC97STAT);
+ 		au_sync();
+ 	} while ((val & PSC_AC97STAT_SR) == 0);
+ 
+@@ -2018,7 +2018,7 @@ au1550_probe(void)
+ 	/* Wait for Device ready.
+ 	*/
+ 	do {
+-		val = readl((void *)PSC_AC97STAT);
++		val = au_readl(PSC_AC97STAT);
+ 		au_sync();
+ 	} while ((val & PSC_AC97STAT_DR) == 0);
+ 
diff --git a/usb/usb-iomega-umini-is-unusual.patch b/usb/usb-iomega-umini-is-unusual.patch
new file mode 100644
index 0000000000000..9243f334478cf
--- /dev/null
+++ b/usb/usb-iomega-umini-is-unusual.patch
@@ -0,0 +1,54 @@
+From akpm@osdl.org Thu Jan  5 22:54:22 2006
+From: David Hardeman <david@2gen.com>
+Message-Id: <200601060650.k066opS4008827@shell0.pdx.osdl.net>
+Subject: USB: iomega umini is unusual
+To: greg@kroah.com
+Cc: akpm@osdl.org, david@2gen.com
+Date: Thu, 05 Jan 2006 22:50:38 -0800
+
+
+From: David Hardeman <david@2gen.com>
+
+The patch removes some harmless warning messages from generated by the
+following Iomega usb key:
+
+> usb-storage: waiting for device to settle before scanning
+>   Vendor: I0MEGA    Model: UMni1GB*IOM2K4    Rev: 1.01
+>   Type:   Direct-Access                      ANSI SCSI revision: 02
+> SCSI device sda: 2048000 512-byte hdwr sectors (1049 MB)
+> sda: Write Protect is off
+> sda: Mode Sense: 00 00 00 00
+> sda: assuming drive cache: write through
+
+Warning message:
+
+> ioctl_internal_command: <8 0 0 0> return code =3D 8000002
+>    : Current: sense key=3D0x0
+>     ASC=3D0x0 ASCQ=3D0x0
+> SCSI device sda: 2048000 512-byte hdwr sectors (1049 MB)
+
+Signed-off-by: David Hardeman <david@2gen.com>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ drivers/usb/storage/unusual_devs.h |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- gregkh-2.6.orig/drivers/usb/storage/unusual_devs.h
++++ gregkh-2.6/drivers/usb/storage/unusual_devs.h
+@@ -1154,6 +1154,15 @@ UNUSUAL_DEV(  0x4146, 0xba01, 0x0100, 0x
+ 		"Micro Mini 1GB",
+ 		US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ),
+ 
++/*
++ * David Hardeman <david@2gen.com>
++ * The key makes the SCSI stack print confusing (but harmless) messages
++ */
++UNUSUAL_DEV(  0x4146, 0xba01, 0x0100, 0x0100,
++		"Iomega",
++		"Micro Mini 1GB",
++		US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ),
++
+ #ifdef CONFIG_USB_STORAGE_SDDR55
+ UNUSUAL_DEV(  0x55aa, 0xa103, 0x0000, 0x9999, 
+ 		"Sandisk",