lua: Fixed some cross-platform issues for PPC (and probably other architectures)

[openwrt.git] / target / linux / adm5120 / files / drivers / usb / host / adm5120-pm.c

diff --git a/target/linux/adm5120/files/drivers/usb/host/adm5120-pm.c b/target/linux/adm5120/files/drivers/usb/host/adm5120-pm.c
index e10a8e9..c88e448 100644 (file)
--- a/target/linux/adm5120/files/drivers/usb/host/adm5120-pm.c
+++ b/target/linux/adm5120/files/drivers/usb/host/adm5120-pm.c
@@ -1,13 +1,16 @@
 /*
  * ADM5120 HCD (Host Controller Driver) for USB
  *
 /*
  * ADM5120 HCD (Host Controller Driver) for USB
  *

- * Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
+ * Copyright (C) 2007,2008 Gabor Juhos <juhosg at openwrt.org>

  *
  * This file was derived from fragments of the OHCI driver.
  *   (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
  *   (C) Copyright 2000-2004 David Brownell <dbrownell@users.sourceforge.net>
  *
  *
  * This file was derived from fragments of the OHCI driver.
  *   (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
  *   (C) Copyright 2000-2004 David Brownell <dbrownell@users.sourceforge.net>
  *

- * This file is licenced under the GPL.
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *

  */
 
 #define OHCI_SCHED_ENABLES \
  */
 
 #define OHCI_SCHED_ENABLES \


@@ -380,9 +383,8 @@ static int admhc_restart(struct admhcd *ahcd)
                                        ed, ed->state);
                }
 
                                        ed, ed->state);
                }
 

-               spin_lock(&urb->lock);
-               urb->status = -ESHUTDOWN;
-               spin_unlock(&urb->lock);
+               if (!urb->unlinked)
+                       urb->unlinked = -ESHUTDOWN;

        }
        finish_unlinks(ahcd, 0);
        spin_unlock_irq(&ahcd->lock);
        }
        finish_unlinks(ahcd, 0);
        spin_unlock_irq(&ahcd->lock);