aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/wusbcore/security.c
diff options
context:
space:
mode:
authorAlexey Zaytsev <alexey.zaytsev@gmail.com>2009-01-09 18:48:28 -0500
committerJiri Kosina <jkosina@suse.cz>2009-03-30 09:21:57 -0400
commit542d886b7f326182cd0a484714d0117e3a8cf11b (patch)
tree531791d11c518ad4082a4d014f19b003e298de34 /drivers/usb/wusbcore/security.c
parent24ec68fb8f0a36a9063f3e72039316e718b628ed (diff)
trivial: Fix dubious bitwise 'and' usage spotted by sparse.
It doesn't change the semantics, but clearly the logical 'and' was meant to be used here. Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/usb/wusbcore/security.c')
-rw-r--r--drivers/usb/wusbcore/security.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/wusbcore/security.c b/drivers/usb/wusbcore/security.c
index 8118db7f1d8..b2f149fedcc 100644
--- a/drivers/usb/wusbcore/security.c
+++ b/drivers/usb/wusbcore/security.c
@@ -562,7 +562,7 @@ void wusbhc_gtk_rekey(struct wusbhc *wusbhc)
562 struct wusb_dev *wusb_dev; 562 struct wusb_dev *wusb_dev;
563 563
564 wusb_dev = wusbhc->port[p].wusb_dev; 564 wusb_dev = wusbhc->port[p].wusb_dev;
565 if (!wusb_dev || !wusb_dev->usb_dev | !wusb_dev->usb_dev->authenticated) 565 if (!wusb_dev || !wusb_dev->usb_dev || !wusb_dev->usb_dev->authenticated)
566 continue; 566 continue;
567 567
568 usb_fill_control_urb(wusb_dev->set_gtk_urb, wusb_dev->usb_dev, 568 usb_fill_control_urb(wusb_dev->set_gtk_urb, wusb_dev->usb_dev,