diff options
| -rw-r--r-- | packaging/generic/print-camera-list.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/packaging/generic/print-camera-list.c b/packaging/generic/print-camera-list.c index 4ec3eff33..0d2070c52 100644 --- a/packaging/generic/print-camera-list.c +++ b/packaging/generic/print-camera-list.c @@ -224,7 +224,7 @@ hotplug_camera_func (const func_params_t *params, ?((*params->argv)[0]) :(GP_USB_HOTPLUG_SCRIPT); - if (a->port & (GP_PORT_USB|GP_PORT_USB_DISK_DIRECT)) { + if (a->port & GP_PORT_USB) { if (a->usb_vendor) { /* usb product id may be zero! */ class = 0; subclass = 0; @@ -522,7 +522,7 @@ udev_camera_func (const func_params_t *params, udev_persistent_data_t *pdata = (udev_persistent_data_t *) data; ASSERT(pdata != NULL); - if (!(a->port & (GP_PORT_USB|GP_PORT_USB_DISK_DIRECT))) + if (!(a->port & GP_PORT_USB)) return 0; if (a->usb_vendor) { /* usb product id may be zero! */ @@ -757,7 +757,7 @@ ddb_camera_func (const func_params_t *params, printf(" };\n"); } - if ((a->port & (GP_PORT_USB|GP_PORT_USB_DISK_DIRECT))) { + if ((a->port & GP_PORT_USB)) { if (a->usb_vendor) { /* usb product id may have the legal value zero! */ DELAYED_HEAD(); @@ -835,7 +835,7 @@ fdi_camera_func (const func_params_t *params, { char *s, *d, model[256]; - if (!(a->port & (GP_PORT_USB|GP_PORT_USB_DISK_DIRECT))) + if (!(a->port & GP_PORT_USB)) return 0; s = (char *) a->model; @@ -851,7 +851,7 @@ fdi_camera_func (const func_params_t *params, } *d = '\0'; - if ((a->port & (GP_PORT_USB|GP_PORT_USB_DISK_DIRECT))) { + if ((a->port & GP_PORT_USB)) { if (a->usb_vendor == 0x07b4 && (a->usb_product == 0x105 || a->usb_product == 0x109) ) { /* Marcus says: The Olympus Sierra/Storage dual mode camera firmware. * Some HAL using software gets deeply confused by this being here @@ -964,7 +964,7 @@ fdi_device_camera_func (const func_params_t *params, { char *s, *d, model[256]; - if (!(a->port & (GP_PORT_USB|GP_PORT_USB_DISK_DIRECT))) + if (!(a->port & GP_PORT_USB)) return 0; s = (char *) a->model; @@ -980,7 +980,7 @@ fdi_device_camera_func (const func_params_t *params, } *d = '\0'; - if ((a->port & (GP_PORT_USB|GP_PORT_USB_DISK_DIRECT))) { + if ((a->port & GP_PORT_USB)) { if (a->usb_vendor == 0x07b4 && (a->usb_product == 0x105 || a->usb_product == 0x109)) { /* Marcus says: The Olympus Sierra/Storage dual mode camera firmware. |