commit 667c77db347fedc1b6c11819dcfed04c5bc7e1a2
author Linux Build Service Account <lnxbuild@localhost> Sun Jan 05 02:59:45 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Jan 05 02:59:45 2014 -0800
tree 156588a342ad261a5ff2bb217267151ac8d57db2
parent 32db178d666e7a859c4cc9d2a02335dbc6103601
parent 53a73355ced58443cbb3cbec434a7b024b863453

Merge "usb: ehci-msm-hsic: avoid double free of platform data"

drivers/usb/host/ehci-msm-hsic.c

diff --git a/drivers/usb/host/ehci-msm-hsic.c b/drivers/usb/host/ehci-msm-hsic.c
index 5f20ad1..1030664 100644
--- a/drivers/usb/host/ehci-msm-hsic.c
+++ b/drivers/usb/host/ehci-msm-hsic.c
@@ -1,6 +1,6 @@
 /* ehci-msm-hsic.c - HSUSB Host Controller Driver Implementation
  *
- * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.
  *
  * Partly derived from ehci-fsl.c and ehci-hcd.c
  * Copyright (c) 2000-2004 by David Brownell
@@ -2263,6 +2263,9 @@
 	iounmap(hcd->regs);
 	usb_put_hcd(hcd);
 
+	if (pdev->dev.of_node)
+		pdev->dev.platform_data = NULL;
+
 	return 0;
 }