diff options
author | Pete Zaitcev <zaitcev@redhat.com> | 2008-06-01 17:38:43 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 18:16:24 -0400 |
commit | 421b4bf5f292cc97c07a7f838595ccf128cc2c92 (patch) | |
tree | 8cb04b18dd2c1b88c151e696f901506c6e5e4d6a /drivers | |
parent | abe28c00b906b79dc9aff81087a81a5608f64170 (diff) |
USB: missing usb_put_hcd to ohci-at91
Looks like usb_put_hcd was missing. Also, make an always-zero function
return void.
Signed-off-by: Pete Zaitcev <zaitcev@yahoo.com>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/host/ohci-at91.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index e534f9de0f05..a5d8e550d897 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c | |||
@@ -91,7 +91,7 @@ static void at91_stop_hc(struct platform_device *pdev) | |||
91 | 91 | ||
92 | /*-------------------------------------------------------------------------*/ | 92 | /*-------------------------------------------------------------------------*/ |
93 | 93 | ||
94 | static int usb_hcd_at91_remove (struct usb_hcd *, struct platform_device *); | 94 | static void usb_hcd_at91_remove (struct usb_hcd *, struct platform_device *); |
95 | 95 | ||
96 | /* configure so an HC device and id are always provided */ | 96 | /* configure so an HC device and id are always provided */ |
97 | /* always called with process context; sleeping is OK */ | 97 | /* always called with process context; sleeping is OK */ |
@@ -184,13 +184,14 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver, | |||
184 | * context, "rmmod" or something similar. | 184 | * context, "rmmod" or something similar. |
185 | * | 185 | * |
186 | */ | 186 | */ |
187 | static int usb_hcd_at91_remove(struct usb_hcd *hcd, | 187 | static void usb_hcd_at91_remove(struct usb_hcd *hcd, |
188 | struct platform_device *pdev) | 188 | struct platform_device *pdev) |
189 | { | 189 | { |
190 | usb_remove_hcd(hcd); | 190 | usb_remove_hcd(hcd); |
191 | at91_stop_hc(pdev); | 191 | at91_stop_hc(pdev); |
192 | iounmap(hcd->regs); | 192 | iounmap(hcd->regs); |
193 | release_mem_region(hcd->rsrc_start, hcd->rsrc_len); | 193 | release_mem_region(hcd->rsrc_start, hcd->rsrc_len); |
194 | usb_put_hcd(hcd); | ||
194 | 195 | ||
195 | if (cpu_is_at91sam9261()) | 196 | if (cpu_is_at91sam9261()) |
196 | clk_put(hclk); | 197 | clk_put(hclk); |
@@ -199,7 +200,6 @@ static int usb_hcd_at91_remove(struct usb_hcd *hcd, | |||
199 | fclk = iclk = hclk = NULL; | 200 | fclk = iclk = hclk = NULL; |
200 | 201 | ||
201 | dev_set_drvdata(&pdev->dev, NULL); | 202 | dev_set_drvdata(&pdev->dev, NULL); |
202 | return 0; | ||
203 | } | 203 | } |
204 | 204 | ||
205 | /*-------------------------------------------------------------------------*/ | 205 | /*-------------------------------------------------------------------------*/ |
@@ -309,7 +309,8 @@ static int ohci_hcd_at91_drv_remove(struct platform_device *pdev) | |||
309 | } | 309 | } |
310 | 310 | ||
311 | device_init_wakeup(&pdev->dev, 0); | 311 | device_init_wakeup(&pdev->dev, 0); |
312 | return usb_hcd_at91_remove(platform_get_drvdata(pdev), pdev); | 312 | usb_hcd_at91_remove(platform_get_drvdata(pdev), pdev); |
313 | return 0; | ||
313 | } | 314 | } |
314 | 315 | ||
315 | #ifdef CONFIG_PM | 316 | #ifdef CONFIG_PM |