From e536840558c990e49a1268db4f6141be03077edd Mon Sep 17 00:00:00 2001 From: Johann Felix Soden Date: Sat, 28 Jul 2007 17:10:33 +0200 Subject: [PATCH] --- yaml --- r: 63196 b: refs/heads/master c: d2298136f17f8fa9fd381d3b688d36e7dbbf0284 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/quirks.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2bb5c020cfae..27998d6ff8e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81ac0dd1914bab227bfdb05baa2362597e39a48c +refs/heads/master: d2298136f17f8fa9fd381d3b688d36e7dbbf0284 diff --git a/trunk/drivers/usb/core/quirks.c b/trunk/drivers/usb/core/quirks.c index d12de3051c06..188457b7e4f5 100644 --- a/trunk/drivers/usb/core/quirks.c +++ b/trunk/drivers/usb/core/quirks.c @@ -34,6 +34,8 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x04a5, 0x207e), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, /* Benq S2W 3300U */ { USB_DEVICE(0x04a5, 0x20b0), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, + /* Canon, Inc. CanoScan N1240U/LiDE30 */ + { USB_DEVICE(0x04a9, 0x220e), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, /* Canon, Inc. CanoScan N650U/N656U */ { USB_DEVICE(0x04a9, 0x2206), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, /* Canon, Inc. CanoScan 1220U */