Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[pandora-kernel.git] / drivers / usb / host / ohci-q.c

diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c
index 1463c39..f7d561e 100644 (file)
--- a/drivers/usb/host/ohci-q.c
+++ b/drivers/usb/host/ohci-q.c
@@ -407,7 +407,8 @@ static struct ed *ed_get (
 
        spin_lock_irqsave (&ohci->lock, flags);
 
-       if (!(ed = ep->hcpriv)) {
+       ed = ep->hcpriv;
+       if (!ed) {
                struct td       *td;
                int             is_out;
                u32             info;