summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRamneek Mehresh <ramneek.mehresh@freescale.com>2014-12-12 08:35:15 (GMT)
committerMatthew Weigel <Matthew.Weigel@freescale.com>2014-12-12 16:15:10 (GMT)
commit6619b8b55796cdf0cec04b66a71288edd3057229 (patch)
tree48cd19fb2ad076ac724ffe6796ba5a78fb88ce45 /arch
parentbdb722ff2c4af6f524c201b36baa5b72442a481d (diff)
downloadlinux-fsl-qoriq-6619b8b55796cdf0cec04b66a71288edd3057229.tar.xz
Revert "drivers:usb:pm: Fix usb wake-up issue in rcpm drv"
Patch a8b2280cbcd16b7935032c72fcc49dadcd2f263c will cause Magic packet cannot wake up system so we need to revert this patch. This reverts commit a8b2280cbcd16b7935032c72fcc49dadcd2f263c. Change-Id: I57f24b544e40ae75f2c28ed8f589405032069ec1 Reviewed-on: http://git.am.freescale.net:8181/25703 Reviewed-by: Dongsheng Wang <dongsheng.wang@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Matthew Weigel <Matthew.Weigel@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/85xx/qoriq_pm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/85xx/qoriq_pm.c b/arch/powerpc/platforms/85xx/qoriq_pm.c
index 58b6cce..f1ec1bd 100644
--- a/arch/powerpc/platforms/85xx/qoriq_pm.c
+++ b/arch/powerpc/platforms/85xx/qoriq_pm.c
@@ -43,8 +43,7 @@ void fsl_set_power_except(struct device *dev, int on)
int ret;
ret = of_property_read_u32_array(dev->of_node, "sleep", value, 2);
-
- if (ret && !strncmp(dev_name(dev), "usb", 3)) {
+ if (ret) {
/* search fman mac node */
phandle_prop = of_get_property(dev->of_node, "fsl,fman-mac",
NULL);
@@ -63,6 +62,7 @@ void fsl_set_power_except(struct device *dev, int on)
qoriq_pm_ops->set_ip_power(on, pw_mask);
return;
+
err:
dev_err(dev, "Can not set wakeup sources\n");
return;