2 files changed, 5 insertions, 1 deletions

diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c
index d9ad60d1c156..fda586d1f7d8 100644
--- a/drivers/usb/renesas_usbhs/common.c
+++ b/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);
diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
index 565bca3aa440..66bbdd12d153 100644
--- a/include/linux/usb/renesas_usbhs.h
+++ b/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 */