projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
pcmcia
/
pxa2xx_base.c
diff --git
a/drivers/pcmcia/pxa2xx_base.c
b/drivers/pcmcia/pxa2xx_base.c
index 87e22ef8eb0213f75ec82efd30c151a564575cd9..0e35acb1366b118773e34db9578daf1b30582119 100644
(file)
--- a/
drivers/pcmcia/pxa2xx_base.c
+++ b/
drivers/pcmcia/pxa2xx_base.c
@@
-302,7
+302,7
@@
static int pxa2xx_drv_pcmcia_remove(struct platform_device *dev)
static int pxa2xx_drv_pcmcia_suspend(struct device *dev)
{
- return pcmcia_socket_dev_suspend(dev
, PMSG_SUSPEND
);
+ return pcmcia_socket_dev_suspend(dev);
}
static int pxa2xx_drv_pcmcia_resume(struct device *dev)