From eb7fc2220c01fee024efb1b84223b07564d75406 Mon Sep 17 00:00:00 2001 From: Paul Walmsley Date: Thu, 16 Aug 2007 16:21:35 -0700 Subject: [PATCH] --- yaml --- r: 64315 b: refs/heads/master c: a78d702beed61956b26c1b6288da868946642317 h: refs/heads/master i: 64313: 4c1fa1a44ed0d1a27166e75f1655f4fe31a132ba 64311: 0966b47126b7f2144099f823a50918649c869f47 v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/quirks.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e1aee376ba59..36171e0cf92a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c907d3b09f7a50023b61ba6ec4e01ccaa543a7ae +refs/heads/master: a78d702beed61956b26c1b6288da868946642317 diff --git a/trunk/drivers/usb/core/quirks.c b/trunk/drivers/usb/core/quirks.c index 655c15d60393..9e467118dc94 100644 --- a/trunk/drivers/usb/core/quirks.c +++ b/trunk/drivers/usb/core/quirks.c @@ -79,6 +79,9 @@ static const struct usb_device_id usb_quirk_list[] = { /* Alcor multi-card reader */ { USB_DEVICE(0x058f, 0x6366), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, + /* Canon EOS 5D in PC Connection mode */ + { USB_DEVICE(0x04a9, 0x3101), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, + /* RIM Blackberry */ { USB_DEVICE(0x0fca, 0x0001), .driver_info = USB_QUIRK_NO_AUTOSUSPEND }, { USB_DEVICE(0x0fca, 0x0004), .driver_info = USB_QUIRK_NO_AUTOSUSPEND },