summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorRamneek Mehresh <ramneek.mehresh@freescale.com>2015-03-23 12:49:52 (GMT)
committerHonghua Yin <Hong-Hua.Yin@freescale.com>2015-04-30 00:44:39 (GMT)
commit3231fc3c1d23399f6c6ba4189992671504653daf (patch)
tree7d5e649a6736c7083a63b84ce9bb93473c3a6964 /drivers/usb
parent643a1e03bf9c7a62044ea9380d6e82f1971f6e44 (diff)
downloadlinux-fsl-qoriq-3231fc3c1d23399f6c6ba4189992671504653daf.tar.xz
powerpc:rcpm:usb: Fix kernel crash in setting usb as wakeup source
Fix kernel crash issue in setting usb as wake-up source for system sleep feature for relevant qoriq platforms (those supporting system sleep via rcpm) Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com> Change-Id: I838234aff00800b6fafbb02ec12de7d3f2cc6075 Reviewed-on: http://git.am.freescale.net:8181/33283 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/core/usb.c1
-rw-r--r--drivers/usb/host/fsl-mph-dr-of.c3
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 5c4bc13..0a6ee2e 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -431,7 +431,6 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
dev->dev.groups = usb_device_groups;
dev->dev.dma_mask = bus->controller->dma_mask;
set_dev_node(&dev->dev, dev_to_node(bus->controller));
- dev->dev.of_node = bus->controller->of_node;
dev->state = USB_STATE_ATTACHED;
dev->lpm_disable_count = 1;
atomic_set(&dev->urbnum, 0);
diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c
index 0c8b8a8..2d01d6a 100644
--- a/drivers/usb/host/fsl-mph-dr-of.c
+++ b/drivers/usb/host/fsl-mph-dr-of.c
@@ -103,9 +103,6 @@ static struct platform_device *fsl_usb2_device_register(
else
dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
- if (pdata->operating_mode != FSL_USB2_DR_DEVICE)
- pdev->dev.of_node = ofdev->dev.of_node;
-
retval = platform_device_add_data(pdev, pdata, sizeof(*pdata));
if (retval)
goto error;