2 files changed, 4 insertions, 2 deletions

diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index 0c3cbd9a388b..b6de43e73699 100644
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -33,7 +33,6 @@ void reset_scoop(struct device *dev)
 
         SCOOP_REG(sdev->base,SCOOP_MCR) = 0x0100;  // 00
         SCOOP_REG(sdev->base,SCOOP_CDR) = 0x0000;  // 04
-        SCOOP_REG(sdev->base,SCOOP_CPR) = 0x0000;  // 0C
         SCOOP_REG(sdev->base,SCOOP_CCR) = 0x0000;  // 10
         SCOOP_REG(sdev->base,SCOOP_IMR) = 0x0000;  // 18
         SCOOP_REG(sdev->base,SCOOP_IRM) = 0x00FF;  // 14
@@ -154,6 +153,7 @@ int __init scoop_probe(struct platform_device *pdev)
 
         SCOOP_REG(devptr->base, SCOOP_MCR) = 0x0140;
         reset_scoop(&pdev->dev);
+        SCOOP_REG(devptr->base, SCOOP_CPR) = 0x0000;
         SCOOP_REG(devptr->base, SCOOP_GPCR) = inf->io_dir & 0xffff;
         SCOOP_REG(devptr->base, SCOOP_GPWR) = inf->io_out & 0xffff;
 
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index 5d34abc64af7..f2007db0cda5 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -127,10 +127,12 @@ static void spitz_card_pwr_ctrl(int device, unsigned short new_cpr)
                         cpr &= ~0x0002;
                 if (device == SPITZ_PWR_SD)
                         cpr &= ~0x0004;
-                write_scoop_reg(&spitzscoop_device.dev, SCOOP_CPR, cpr | new_cpr);
                 if (!(cpr & 0x0002) && !(cpr & 0x0004)) {
+                        write_scoop_reg(&spitzscoop_device.dev, SCOOP_CPR, 0x0000);
                         mdelay(1);
                         reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_CF_POWER);
+                } else {
+                        write_scoop_reg(&spitzscoop_device.dev, SCOOP_CPR, cpr | new_cpr);
                 }
         }
 }