summaryrefslogtreecommitdiffstats
path: root/drivers/usb/uhci.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-05-12 23:48:34 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-05-12 23:48:34 +0000
commit7fd36ebeeec9244a7431bb010e6e3c5e4848a0d5 (patch)
tree5fb03a9aafdd1cec5f4f6ff7f1873174cb89b66c /drivers/usb/uhci.c
parentba2dacab305c598cd4c34a604f8e276bf5bab5ff (diff)
Merge with Linux 2.3.99-pre8. Linus must hate me, too man patches ;-)
Diffstat (limited to 'drivers/usb/uhci.c')
-rw-r--r--drivers/usb/uhci.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/uhci.c b/drivers/usb/uhci.c
index 9ce5c07ec..2eaab47ef 100644
--- a/drivers/usb/uhci.c
+++ b/drivers/usb/uhci.c
@@ -289,10 +289,10 @@ static void uhci_free_td(struct uhci_td *td)
if (!list_empty(&td->list))
dbg("td is still in URB list!");
- kmem_cache_free(uhci_td_cachep, td);
-
if (td->dev)
usb_dec_dev_use(td->dev);
+
+ kmem_cache_free(uhci_td_cachep, td);
}
static struct uhci_qh *uhci_alloc_qh(struct usb_device *dev)
@@ -318,10 +318,10 @@ static struct uhci_qh *uhci_alloc_qh(struct usb_device *dev)
static void uhci_free_qh(struct uhci_qh *qh)
{
- kmem_cache_free(uhci_qh_cachep, qh);
-
if (qh->dev)
usb_dec_dev_use(qh->dev);
+
+ kmem_cache_free(uhci_qh_cachep, qh);
}
static void uhci_insert_qh(struct uhci *uhci, struct uhci_qh *skelqh, struct uhci_qh *qh)