Commit 1b6d94aa authored by Richard Purdie's avatar Richard Purdie Committed by Russell King

[ARM PATCH] 2315/1: PXA PCMCIA Suspend/Resume bugfix

Patch from Richard Purdie

The base PCMCIA code for PXA2xx doesn't work over a suspend/resume 
cycle as the MECR register isn't preserved. This patch restores 
the register.

Signed-off-by: Richard Purdie
Signed-off-by: Russell King
parent 12ccb661
......@@ -217,7 +217,13 @@ static int pxa2xx_drv_pcmcia_resume(struct device *dev, u32 level)
{
int ret = 0;
if (level == RESUME_RESTORE_STATE)
{
struct pcmcia_low_level *ops = dev->platform_data;
int nr = ops ? ops->nr : 0;
MECR = nr > 1 ? MECR_CIT | MECR_NOS : (nr > 0 ? MECR_CIT : 0);
ret = pcmcia_socket_dev_resume(dev);
}
return ret;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment