Răsfoiți Sursa

usb: renesas_usbhs: remove callback when module removed.

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>
Kuninori Morimoto 14 ani în urmă
părinte
comite
af32fe5113
2 a modificat fișierele cu 5 adăugiri și 1 ștergeri
  1. 4 0
      drivers/usb/renesas_usbhs/common.c
  2. 1 1
      include/linux/usb/renesas_usbhs.h

+ 4 - 0
drivers/usb/renesas_usbhs/common.c

@@ -352,9 +352,13 @@ probe_end_kfree:
 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);

+ 1 - 1
include/linux/usb/renesas_usbhs.h

@@ -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 */