diff options
| author | Daniel Drake | 2006-07-26 14:59:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2006-08-03 01:41:42 +0200 |
| commit | 3c332422f78159a0f5e4bc5f0ed8bbcbf51d9462 (patch) | |
| tree | 3fdb307aac396d9ae022d78b547cda48fb7d1aa2 /drivers/usb/storage/unusual_devs.h | |
| parent | USB: New USB ID for Belkin Serial Adapter (diff) | |
| download | kernel-qcow2-linux-3c332422f78159a0f5e4bc5f0ed8bbcbf51d9462.tar.gz kernel-qcow2-linux-3c332422f78159a0f5e4bc5f0ed8bbcbf51d9462.tar.xz kernel-qcow2-linux-3c332422f78159a0f5e4bc5f0ed8bbcbf51d9462.zip | |
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.h | 10 |
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, "Optio S/S4", US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY ), - + +/* This is a virtual windows driver CD, which the zd1211rw driver automatically + * converts into a WLAN device. */ +UNUSUAL_DEV( 0x0ace, 0x2011, 0x0101, 0x0101, + "ZyXEL", + "G-220F USB-WLAN Install", + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_IGNORE_DEVICE ), + #ifdef CONFIG_USB_STORAGE_ISD200 UNUSUAL_DEV( 0x0bf6, 0xa001, 0x0100, 0x0110, "ATI", |