diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 12:25:47 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 12:25:47 -0500 |
commit | 2bf2154c6bb5599e3ec3f73c34861a0b12aa839e (patch) | |
tree | 62691bd915e2e3c2e6648306d3fb893f7a1dc57e /drivers/usb/host/isp116x-hcd.c | |
parent | 08a4ecee986dd98e86090ff5faac4782b6765aed (diff) | |
parent | 71a8924bee63d891f6256d560e32416a458440b3 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (81 commits)
[PATCH] USB: omninet: fix up debugging comments
[PATCH] USB serial: add navman driver
[PATCH] USB: Fix irda-usb use after use
[PATCH] USB: rtl8150 small fix
[PATCH] USB: ftdi_sio: add Icom ID1 USB product and vendor ids
[PATCH] USB: cp2101: add new device IDs
[PATCH] USB: fix check_ctrlrecip to allow control transfers in state ADDRESS
[PATCH] USB: vicam.c: fix a NULL pointer dereference
[PATCH] USB: ZC0301 driver bugfix
[PATCH] USB: add support for Creativelabs Silvercrest USB keyboard
[PATCH] USB: storage: new unusual_devs.h entry: Mitsumi 7in1 Card Reader
[PATCH] USB: storage: unusual_devs.h entry 0420:0001
[PATCH] USB: storage: another unusual_devs.h entry
[PATCH] USB: storage: sandisk unusual_devices entry
[PATCH] USB: fix initdata issue in isp116x-hcd
[PATCH] USB: usbcore: usb_set_configuration oops (NULL ptr dereference)
[PATCH] USB: usbcore: Don't assume a USB configuration includes any interfaces
[PATCH] USB: ub 03 drop stall clearing
[PATCH] USB: ub 02 remove diag
[PATCH] USB: ub 01 remove first_open
...
Diffstat (limited to 'drivers/usb/host/isp116x-hcd.c')
-rw-r--r-- | drivers/usb/host/isp116x-hcd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index 972ce04889f8..e99210b7909b 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c | |||
@@ -724,7 +724,7 @@ static int isp116x_urb_enqueue(struct usb_hcd *hcd, | |||
724 | ep = hep->hcpriv; | 724 | ep = hep->hcpriv; |
725 | else { | 725 | else { |
726 | INIT_LIST_HEAD(&ep->schedule); | 726 | INIT_LIST_HEAD(&ep->schedule); |
727 | ep->udev = usb_get_dev(udev); | 727 | ep->udev = udev; |
728 | ep->epnum = epnum; | 728 | ep->epnum = epnum; |
729 | ep->maxpacket = usb_maxpacket(udev, urb->pipe, is_out); | 729 | ep->maxpacket = usb_maxpacket(udev, urb->pipe, is_out); |
730 | usb_settoggle(udev, epnum, is_out, 0); | 730 | usb_settoggle(udev, epnum, is_out, 0); |
@@ -891,7 +891,6 @@ static void isp116x_endpoint_disable(struct usb_hcd *hcd, | |||
891 | if (!list_empty(&hep->urb_list)) | 891 | if (!list_empty(&hep->urb_list)) |
892 | WARN("ep %p not empty?\n", ep); | 892 | WARN("ep %p not empty?\n", ep); |
893 | 893 | ||
894 | usb_put_dev(ep->udev); | ||
895 | kfree(ep); | 894 | kfree(ep); |
896 | hep->hcpriv = NULL; | 895 | hep->hcpriv = NULL; |
897 | } | 896 | } |
@@ -1553,7 +1552,7 @@ static struct hc_driver isp116x_hc_driver = { | |||
1553 | 1552 | ||
1554 | /*----------------------------------------------------------------*/ | 1553 | /*----------------------------------------------------------------*/ |
1555 | 1554 | ||
1556 | static int __init_or_module isp116x_remove(struct platform_device *pdev) | 1555 | static int isp116x_remove(struct platform_device *pdev) |
1557 | { | 1556 | { |
1558 | struct usb_hcd *hcd = platform_get_drvdata(pdev); | 1557 | struct usb_hcd *hcd = platform_get_drvdata(pdev); |
1559 | struct isp116x *isp116x; | 1558 | struct isp116x *isp116x; |