Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / usb / wusbcore / security.c

diff --git a/drivers/usb/wusbcore/security.c b/drivers/usb/wusbcore/security.c
index 8118db7f1d8ddd230b8f5e6c2dcc116d2eb64d89..b2f149fedcc50ce2a705c51c8f1148ec2346c8ed 100644 (file)
--- a/drivers/usb/wusbcore/security.c
+++ b/drivers/usb/wusbcore/security.c
@@ -562,7 +562,7 @@ void wusbhc_gtk_rekey(struct wusbhc *wusbhc)
                struct wusb_dev *wusb_dev;
 
                wusb_dev = wusbhc->port[p].wusb_dev;
-               if (!wusb_dev || !wusb_dev->usb_dev | !wusb_dev->usb_dev->authenticated)
+               if (!wusb_dev || !wusb_dev->usb_dev || !wusb_dev->usb_dev->authenticated)
                        continue;
 
                usb_fill_control_urb(wusb_dev->set_gtk_urb, wusb_dev->usb_dev,