diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index ad62066..d3df3e8 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -428,7 +428,7 @@ static int wm8731_resume(struct platform
 		data[1] = cache[i] & 0x00ff;
 		codec->hw_write(codec->control_data, data, 2);
 	}
-	wm8731_dpm_event(codec, SNDRV_CTL_POWER_D3hot);
+	wm8731_dpm_event(codec, codec->suspend_dpm_state);
 	return 0;
 }
 
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index 15bdd62..de7e969 100644
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -706,7 +706,7 @@ static int wm8750_resume(struct platform
 		codec->hw_write(codec->control_data, data, 2);
 	}
 	
-	wm8750_dpm_event(codec, SNDRV_CTL_POWER_D3hot);
+	wm8750_dpm_event(codec, codec->suspend_dpm_state);
 	return 0;
 }
 
diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
index a9654b1..88d5659 100644
--- a/sound/soc/codecs/wm8971.c
+++ b/sound/soc/codecs/wm8971.c
@@ -643,7 +643,7 @@ static int wm8971_resume(struct platform
 		codec->hw_write(codec->control_data, data, 2);
 	}
 	
-	wm8971_dpm_event(codec, SNDRV_CTL_POWER_D3hot);
+	wm8971_dpm_event(codec, codec->suspend_dpm_state);
 	return 0;
 }
 
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index 3d1226b..8063030 100644
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -65,7 +65,7 @@ static void corgi_hp_work(void *data)
 	printk("HP Status: %d\n", hp_status);
 	corgikbd_report_hp(hp_status);
 	
-	/* FIXME - Richard can you check, this will change dpm status */
+	/* change the dpm status depending on the insertion */
 	if(hp_status == 1) {
 		snd_soc_dpm_set_connection(codec, "ROUT", 0);
 		snd_soc_dpm_set_connection(codec, "LOUT", 0);
@@ -84,7 +84,7 @@ int corgi_get_snd_scoop(snd_kcontrol_t *
 {
 	unsigned short reg = kcontrol->private_value;
 	
-	ucontrol->value.integer.value[0] = ((read_scoop_reg(&corgiscoop_device.dev, SCOOP_GPWR) & reg) != 1);
+	ucontrol->value.integer.value[0] = ((read_scoop_reg(&corgiscoop_device.dev, SCOOP_GPWR) & reg) == 0);
 	return 0;
 }
 
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 04c9b13..1da39a7 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -28,7 +28,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>
-#include <linux/i2c.h>
 #include <linux/pm.h>
 #include <linux/bitops.h>
 #include <linux/platform_device.h>
diff --git a/sound/soc/soc-dpm.c b/sound/soc/soc-dpm.c
index 27d6364..eb665ac 100644
--- a/sound/soc/soc-dpm.c
+++ b/sound/soc/soc-dpm.c
@@ -34,7 +34,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>
-#include <linux/i2c.h>
 #include <linux/pm.h>
 #include <linux/bitops.h>
 #include <linux/platform_device.h>
diff --git a/include/sound/soc.h b/include/sound/soc.h
index e952b52..fbe4c27 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -21,7 +21,7 @@
 #include <sound/control.h>
 #include <sound/ac97_codec.h>
 
-#define SND_SOC_VERSION "0.9rc4"
+#define SND_SOC_VERSION "0.9rc5"
 
 /*
  * Convenience kcontrol builders