Skip to content

Commit

Permalink
USB: missing usb_put_hcd to ohci-at91
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Pete Zaitcev authored and Greg Kroah-Hartman committed Jul 21, 2008
1 parent abe28c0 commit 421b4bf
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/usb/host/ohci-at91.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ static void at91_stop_hc(struct platform_device *pdev)

/*-------------------------------------------------------------------------*/

static int usb_hcd_at91_remove (struct usb_hcd *, struct platform_device *);
static void usb_hcd_at91_remove (struct usb_hcd *, struct platform_device *);

/* configure so an HC device and id are always provided */
/* always called with process context; sleeping is OK */
Expand Down Expand Up @@ -184,13 +184,14 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
* context, "rmmod" or something similar.
*
*/
static int usb_hcd_at91_remove(struct usb_hcd *hcd,
static void usb_hcd_at91_remove(struct usb_hcd *hcd,
struct platform_device *pdev)
{
usb_remove_hcd(hcd);
at91_stop_hc(pdev);
iounmap(hcd->regs);
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
usb_put_hcd(hcd);

if (cpu_is_at91sam9261())
clk_put(hclk);
Expand All @@ -199,7 +200,6 @@ static int usb_hcd_at91_remove(struct usb_hcd *hcd,
fclk = iclk = hclk = NULL;

dev_set_drvdata(&pdev->dev, NULL);
return 0;
}

/*-------------------------------------------------------------------------*/
Expand Down Expand Up @@ -309,7 +309,8 @@ static int ohci_hcd_at91_drv_remove(struct platform_device *pdev)
}

device_init_wakeup(&pdev->dev, 0);
return usb_hcd_at91_remove(platform_get_drvdata(pdev), pdev);
usb_hcd_at91_remove(platform_get_drvdata(pdev), pdev);
return 0;
}

#ifdef CONFIG_PM
Expand Down

0 comments on commit 421b4bf

Please sign in to comment.