From 61c6c5fb664775f7423d687eb0dcaa9023030b30 Mon Sep 17 00:00:00 2001 From: Alexey Zaytsev Date: Sat, 10 Jan 2009 02:48:28 +0300 Subject: [PATCH] --- yaml --- r: 140370 b: refs/heads/master c: 542d886b7f326182cd0a484714d0117e3a8cf11b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/wusbcore/security.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 32550bf9cebf..f5ee1a89eb10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24ec68fb8f0a36a9063f3e72039316e718b628ed +refs/heads/master: 542d886b7f326182cd0a484714d0117e3a8cf11b diff --git a/trunk/drivers/usb/wusbcore/security.c b/trunk/drivers/usb/wusbcore/security.c index 8118db7f1d8d..b2f149fedcc5 100644 --- a/trunk/drivers/usb/wusbcore/security.c +++ b/trunk/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,