Skip to content

Commit

Permalink
usb: renesas_usbhs: remove callback when module removed.
Browse files Browse the repository at this point in the history
The callback function which is called from platform must be removed
if module removed.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Kuninori Morimoto authored and Greg Kroah-Hartman committed Apr 30, 2011
1 parent 9a28b7b commit af32fe5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions drivers/usb/renesas_usbhs/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -352,9 +352,13 @@ static int __devinit usbhs_probe(struct platform_device *pdev)
static int __devexit usbhs_remove(struct platform_device *pdev)
{
struct usbhs_priv *priv = usbhsc_pdev_to_priv(pdev);
struct renesas_usbhs_platform_info *info = pdev->dev.platform_data;
struct renesas_usbhs_driver_callback *dfunc = &info->driver_callback;

dev_dbg(&pdev->dev, "usb remove\n");

dfunc->notify_hotplug = NULL;

pm_runtime_disable(&pdev->dev);

usbhsc_bus_ctrl(priv, 0);
Expand Down
2 changes: 1 addition & 1 deletion include/linux/usb/renesas_usbhs.h
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ struct renesas_usbhs_platform_info {
({ \
struct renesas_usbhs_driver_callback *dc; \
dc = &(renesas_usbhs_get_info(pdev)->driver_callback); \
if (dc) \
if (dc && dc->notify_hotplug) \
dc->notify_hotplug(pdev); \
})
#endif /* RENESAS_USB_H */

0 comments on commit af32fe5

Please sign in to comment.