summaryrefslogtreecommitdiff
path: root/libgphoto2/gphoto2-abilities-list.c
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2010-03-13 11:37:19 +0000
committerMarcus Meissner <marcus@jet.franken.de>2010-03-13 11:37:19 +0000
commit74ba5ed9e3ce7302d779da48c88c1710367ae4b2 (patch)
tree8d4ecf25d34ffc51778e67ff3a32f3b78ebbf827 /libgphoto2/gphoto2-abilities-list.c
parentb3cca91b3d4b5523ddf83f3ee0acb947f008d3be (diff)
downloadlibgphoto2-74ba5ed9e3ce7302d779da48c88c1710367ae4b2.tar.gz
added usbdiskdirect stuff, new error code
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@12755 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'libgphoto2/gphoto2-abilities-list.c')
-rw-r--r--libgphoto2/gphoto2-abilities-list.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libgphoto2/gphoto2-abilities-list.c b/libgphoto2/gphoto2-abilities-list.c
index e16e3565c..c26a53490 100644
--- a/libgphoto2/gphoto2-abilities-list.c
+++ b/libgphoto2/gphoto2-abilities-list.c
@@ -339,7 +339,7 @@ gp_abilities_list_detect_usb (CameraAbilitiesList *list,
for (i = 0; i < count; i++) {
int v, p, c, s;
- if (!(list->abilities[i].port & GP_PORT_USB))
+ if (!(list->abilities[i].port & port->type))
continue;
v = list->abilities[i].usb_vendor;
@@ -441,7 +441,8 @@ gp_abilities_list_detect (CameraAbilitiesList *list,
if (res <GP_OK)
continue;
switch (type) {
- case GP_PORT_USB: {
+ case GP_PORT_USB:
+ case GP_PORT_USB_DISK_DIRECT: {
int ability;
res = gp_abilities_list_detect_usb (list, &ability, port);