summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2011-04-05 20:42:44 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2011-04-05 20:42:44 +0000
commit0d679e66aa1bbe99765255105f187afb1d4e9ae9 (patch)
treeacab8bb72b859800303432ab4d8d35f1dc188ee6
parent16d5ad394e387824688aa57a0d296d5a61f75fd6 (diff)
binary vs logical or, found by clang
ok mikeb@ deraadt@
-rw-r--r--sys/dev/usb/uticom.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/usb/uticom.c b/sys/dev/usb/uticom.c
index 60b9a002cbb..d3c3d058366 100644
--- a/sys/dev/usb/uticom.c
+++ b/sys/dev/usb/uticom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uticom.c,v 1.13 2011/01/25 20:03:36 jakemsr Exp $ */
+/* $OpenBSD: uticom.c,v 1.14 2011/04/05 20:42:43 jsg Exp $ */
/*
* Copyright (c) 2005 Dmitry Komissaroff <dxi@mail.ru>.
*
@@ -972,7 +972,7 @@ uticom_download_fw(struct uticom_softc *sc, int pipeno,
memcpy(obuf, buffer, buffer_size);
usbd_setup_xfer(oxfer, pipe, (usbd_private_handle)sc, obuf, buffer_size,
- USBD_NO_COPY || USBD_SYNCHRONOUS, USBD_NO_TIMEOUT, 0);
+ USBD_NO_COPY | USBD_SYNCHRONOUS, USBD_NO_TIMEOUT, 0);
err = usbd_sync_transfer(oxfer);
if (err != USBD_NORMAL_COMPLETION)