aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage/unusual_devs.h
diff options
context:
space:
mode:
authorDaniel Drake <dsd@gentoo.org>2006-07-26 08:59:23 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-08-02 19:41:42 -0400
commit3c332422f78159a0f5e4bc5f0ed8bbcbf51d9462 (patch)
tree3fdb307aac396d9ae022d78b547cda48fb7d1aa2 /drivers/usb/storage/unusual_devs.h
parentb7aa94b682dc6b6dcdc01d36f8e65cef5aae81e2 (diff)
usb-storage: Add US_FL_IGNORE_DEVICE flag; ignore ZyXEL G220F
This patch adds a new unusual_devs flag for when usb-storage needs to ignore a device that it would otherwise claim. We need to ignore the ZyXEL G220F as it is a virtual CDROM drive which includes the windows driver for this USB-WLAN adapter. After the windows driver is installed on a windows system, it converts it into a WLAN adapter (by ejecting the virtual disc). The virtual CDROM is of no interest to Linux users. The zd1211rw driver will automatically perform the eject operation, we just need to ensure that usb-storage does not claim the device. Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: Matthew Dharm <mdharm-usb@one-eyed-alien.net> Signed-off-by: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/storage/unusual_devs.h')
-rw-r--r--drivers/usb/storage/unusual_devs.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index a5ca449f6e64..ca6c56fba282 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1106,7 +1106,15 @@ UNUSUAL_DEV( 0x0a17, 0x006, 0x0000, 0xffff,
1106 "Optio S/S4", 1106 "Optio S/S4",
1107 US_SC_DEVICE, US_PR_DEVICE, NULL, 1107 US_SC_DEVICE, US_PR_DEVICE, NULL,
1108 US_FL_FIX_INQUIRY ), 1108 US_FL_FIX_INQUIRY ),
1109 1109
1110/* This is a virtual windows driver CD, which the zd1211rw driver automatically
1111 * converts into a WLAN device. */
1112UNUSUAL_DEV( 0x0ace, 0x2011, 0x0101, 0x0101,
1113 "ZyXEL",
1114 "G-220F USB-WLAN Install",
1115 US_SC_DEVICE, US_PR_DEVICE, NULL,
1116 US_FL_IGNORE_DEVICE ),
1117
1110#ifdef CONFIG_USB_STORAGE_ISD200 1118#ifdef CONFIG_USB_STORAGE_ISD200
1111UNUSUAL_DEV( 0x0bf6, 0xa001, 0x0100, 0x0110, 1119UNUSUAL_DEV( 0x0bf6, 0xa001, 0x0100, 0x0110,
1112 "ATI", 1120 "ATI",