From 6619b8b55796cdf0cec04b66a71288edd3057229 Mon Sep 17 00:00:00 2001 From: Ramneek Mehresh Date: Fri, 12 Dec 2014 14:05:15 +0530 Subject: 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 Tested-by: Review Code-CDREVIEW Reviewed-by: Matthew Weigel 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; -- cgit v0.10.2