summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/serial
diff options
context:
space:
mode:
authorn_hibma <n_hibma@FreeBSD.org>2014-08-05 11:50:16 +0000
committern_hibma <n_hibma@FreeBSD.org>2014-08-05 11:50:16 +0000
commit8ed602ddaba5235124b4d377f8ae70c880de27b7 (patch)
treec52b14e6c198f5460355355ee2cae74e5b1d3479 /sys/dev/usb/serial
parent3ac98abb89673d3272cb4ae85f2e2dac94d5b3ca (diff)
downloadFreeBSD-src-8ed602ddaba5235124b4d377f8ae70c880de27b7.zip
FreeBSD-src-8ed602ddaba5235124b4d377f8ae70c880de27b7.tar.gz
don't OR integer error values together as this does not make sense.
Instead bail on the first failed command.
Diffstat (limited to 'sys/dev/usb/serial')
-rw-r--r--sys/dev/usb/serial/u3g.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/usb/serial/u3g.c b/sys/dev/usb/serial/u3g.c
index caced41..bbf5351 100644
--- a/sys/dev/usb/serial/u3g.c
+++ b/sys/dev/usb/serial/u3g.c
@@ -754,7 +754,8 @@ u3g_test_autoinst(void *arg, struct usb_device *udev,
break;
case U3GINIT_ZTESTOR:
error = usb_msc_eject(udev, 0, MSC_EJECT_STOPUNIT);
- error |= usb_msc_eject(udev, 0, MSC_EJECT_ZTESTOR);
+ if (error == 0)
+ error = usb_msc_eject(udev, 0, MSC_EJECT_ZTESTOR);
break;
case U3GINIT_CMOTECH:
error = usb_msc_eject(udev, 0, MSC_EJECT_CMOTECH);
OpenPOWER on IntegriCloud