Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8e62dd6 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

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: default avatarAlan Stern <stern@rowland.harvard.edu>
Tested-By: default avatarTony Vroon <tony@linx.net>
CC: <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e6251a92

drivers/usb/storage/unusual_realtek.h

+5 −5
Original line number Diff line number Diff line
@@ -23,19 +23,19 @@ 
#if defined(CONFIG_USB_STORAGE_REALTEK) || \

		defined(CONFIG_USB_STORAGE_REALTEK_MODULE)



UNUSUAL_DEV(0x0bda, 0x0159, 0x0000, 0x9999,

UNUSUAL_DEV(0x0bda, 0x0138, 0x0000, 0x9999,

		"Realtek",

		"USB Card Reader",

		USB_SC_SCSI, USB_PR_BULK, init_realtek_cr, 0),

		USB_SC_DEVICE, USB_PR_DEVICE, init_realtek_cr, 0),



UNUSUAL_DEV(0x0bda, 0x0158, 0x0000, 0x9999,

		"Realtek",

		"USB Card Reader",

		USB_SC_SCSI, USB_PR_BULK, init_realtek_cr, 0),

		USB_SC_DEVICE, USB_PR_DEVICE, init_realtek_cr, 0),



UNUSUAL_DEV(0x0bda, 0x0138, 0x0000, 0x9999,

UNUSUAL_DEV(0x0bda, 0x0159, 0x0000, 0x9999,

		"Realtek",

		"USB Card Reader",

		USB_SC_SCSI, USB_PR_BULK, init_realtek_cr, 0),

		USB_SC_DEVICE, USB_PR_DEVICE, init_realtek_cr, 0),



#endif  /* defined(CONFIG_USB_STORAGE_REALTEK) || ... */