diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2011-05-17 14:45:48 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-17 14:56:28 -0400 |
| commit | a8e62dd6d91f3bc3687abbb26227e5fc39c4829c (patch) | |
| tree | 9edb01943d01a63d2d87d5079af7dbf00c6d35fb /drivers/usb/storage | |
| parent | e6251a921716fca9c2e3008af2d8d0d5657a59bc (diff) | |
usb-storage: fix up the unusual_realtek device list
This patch (as1461) fixes the unusual_devs entries for the Realtek USB
card reader. They should be ordered by PID, and they should not
override the Subclass and Protocol values provided by the device.
Otherwise a notification about unnecessary entries gets printed in the
kernel log during probing.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Tested-By: Tony Vroon <tony@linx.net>
CC: <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/storage')
| -rw-r--r-- | drivers/usb/storage/unusual_realtek.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/storage/unusual_realtek.h b/drivers/usb/storage/unusual_realtek.h index 3236e032851..e41f50c95ed 100644 --- a/drivers/usb/storage/unusual_realtek.h +++ b/drivers/usb/storage/unusual_realtek.h | |||
| @@ -23,19 +23,19 @@ | |||
| 23 | #if defined(CONFIG_USB_STORAGE_REALTEK) || \ | 23 | #if defined(CONFIG_USB_STORAGE_REALTEK) || \ |
| 24 | defined(CONFIG_USB_STORAGE_REALTEK_MODULE) | 24 | defined(CONFIG_USB_STORAGE_REALTEK_MODULE) |
| 25 | 25 | ||
| 26 | UNUSUAL_DEV(0x0bda, 0x0159, 0x0000, 0x9999, | 26 | UNUSUAL_DEV(0x0bda, 0x0138, 0x0000, 0x9999, |
| 27 | "Realtek", | 27 | "Realtek", |
| 28 | "USB Card Reader", | 28 | "USB Card Reader", |
| 29 | USB_SC_SCSI, USB_PR_BULK, init_realtek_cr, 0), | 29 | USB_SC_DEVICE, USB_PR_DEVICE, init_realtek_cr, 0), |
| 30 | 30 | ||
| 31 | UNUSUAL_DEV(0x0bda, 0x0158, 0x0000, 0x9999, | 31 | UNUSUAL_DEV(0x0bda, 0x0158, 0x0000, 0x9999, |
| 32 | "Realtek", | 32 | "Realtek", |
| 33 | "USB Card Reader", | 33 | "USB Card Reader", |
| 34 | USB_SC_SCSI, USB_PR_BULK, init_realtek_cr, 0), | 34 | USB_SC_DEVICE, USB_PR_DEVICE, init_realtek_cr, 0), |
| 35 | 35 | ||
| 36 | UNUSUAL_DEV(0x0bda, 0x0138, 0x0000, 0x9999, | 36 | UNUSUAL_DEV(0x0bda, 0x0159, 0x0000, 0x9999, |
| 37 | "Realtek", | 37 | "Realtek", |
| 38 | "USB Card Reader", | 38 | "USB Card Reader", |
| 39 | USB_SC_SCSI, USB_PR_BULK, init_realtek_cr, 0), | 39 | USB_SC_DEVICE, USB_PR_DEVICE, init_realtek_cr, 0), |
| 40 | 40 | ||
| 41 | #endif /* defined(CONFIG_USB_STORAGE_REALTEK) || ... */ | 41 | #endif /* defined(CONFIG_USB_STORAGE_REALTEK) || ... */ |