Author: n_hibma
Date: Tue Aug  5 11:50:16 2014
New Revision: 269582
URL: http://svnweb.freebsd.org/changeset/base/269582

Log:
  don't OR integer error values together as this does not make sense.
  Instead bail on the first failed command.

Modified:
  head/sys/dev/usb/serial/u3g.c

Modified: head/sys/dev/usb/serial/u3g.c
==============================================================================
--- head/sys/dev/usb/serial/u3g.c       Tue Aug  5 10:48:53 2014        
(r269581)
+++ head/sys/dev/usb/serial/u3g.c       Tue Aug  5 11:50:16 2014        
(r269582)
@@ -754,7 +754,8 @@ u3g_test_autoinst(void *arg, struct usb_
                        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);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to