diff options
| author | Mariusz Woloszyn <emsi@ipartners.pl> | 2002-01-04 13:35:57 +0000 |
|---|---|---|
| committer | Mariusz Woloszyn <emsi@ipartners.pl> | 2002-01-04 13:35:57 +0000 |
| commit | 7b5d5b5d43baf0a0352add905dd9dea83936a76d (patch) | |
| tree | 2004f0af8892bbe15b0115934a275a2a67dcb775 | |
| parent | 822371015fe4452fddb1a51d29d8ff34ee238468 (diff) | |
| download | libgphoto2-7b5d5b5d43baf0a0352add905dd9dea83936a76d.tar.gz | |
* fixed USB class detection code bug
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3699 67ed7778-7388-44ab-90cf-0a291f65f57c
| -rw-r--r-- | libgphoto2/gphoto2-camera.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libgphoto2/gphoto2-camera.c b/libgphoto2/gphoto2-camera.c index b409aeb0c..4c5d18dbc 100644 --- a/libgphoto2/gphoto2-camera.c +++ b/libgphoto2/gphoto2-camera.c @@ -859,9 +859,16 @@ gp_camera_init (Camera *camera) gp_camera_status (camera, ""); return (GP_ERROR_UNKNOWN_PORT); case GP_PORT_USB: - CRS (camera, gp_port_usb_find_device (camera->port, + if (gp_port_usb_find_device (camera->port, camera->pc->a.usb_vendor, - camera->pc->a.usb_product)); + camera->pc->a.usb_product)!=GP_OK) + { + CRS (camera, gp_port_usb_find_device_by_class + (camera->port, + camera->pc->a.usb_class, + camera->pc->a.usb_subclass, + camera->pc->a.usb_protocol)); + } break; default: break; |