Commit:     a78d702beed61956b26c1b6288da868946642317
Parent:     c907d3b09f7a50023b61ba6ec4e01ccaa543a7ae
Author:     Paul Walmsley <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 16 16:21:35 2007 -0700
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Aug 22 14:28:01 2007 -0700

    usb quirks: Add Canon EOS 5D (PC Connection mode) to the autosuspend 
    Recent versions of the Linux kernel auto-suspend attached USB devices.
    After this happens to the Canon EOS 5D camera, the camera's interrupt 
    don't seem to wake back up correctly, causing further use with libgphoto2
    to fail with a -114 "OS error in camera communication" error.
    A similar fix is probably necessary for this camera in PTP mode, which
    identifies as USB product id 0x3102, but we haven't tested this.
    As part of our testing process, we tried the USB_QUIRK_RESET_RESUME
    quirk also, it's not helpful in this case.
    Signed-off-by: Raj Kumar <[EMAIL PROTECTED]>
    Signed-off-by: Paul Walmsley <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
 drivers/usb/core/quirks.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 655c15d..9e46711 100644
--- a/drivers/usb/core/quirks.c
+++ b/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 },
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to