diff --git a/[refs] b/[refs]
index 1b26aa2c9857..b1ce0565aa63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb03d4fc6c9bc4bf509221101639cde1b8330405
+refs/heads/master: 31dea7385174596f4369f71c712f1d1006a3fa05
diff --git a/trunk/drivers/staging/intel_sst/intel_sst_drv_interface.c b/trunk/drivers/staging/intel_sst/intel_sst_drv_interface.c
index e9c182108243..971588ce26d3 100644
--- a/trunk/drivers/staging/intel_sst/intel_sst_drv_interface.c
+++ b/trunk/drivers/staging/intel_sst/intel_sst_drv_interface.c
@@ -508,7 +508,6 @@ int register_sst_card(struct intel_sst_card_ops *card)
 			sst_drv_ctx->pmic_state = SND_MAD_INIT_DONE;
 			sst_drv_ctx->rx_time_slot_status = 0; /*default AMIC*/
 			card->pcm_control = sst_pmic_ops.pcm_control;
-			sst_drv_ctx->scard_ops->card_status = SND_CARD_UN_INIT;
 			return 0;
 		} else {
 			pr_err("strcmp fail %s\n", card->module_name);
diff --git a/trunk/drivers/staging/intel_sst/intelmid.c b/trunk/drivers/staging/intel_sst/intelmid.c
index d207636a7b6d..2d4b94a8aa9d 100644
--- a/trunk/drivers/staging/intel_sst/intelmid.c
+++ b/trunk/drivers/staging/intel_sst/intelmid.c
@@ -802,6 +802,7 @@ static int __devinit snd_intelmad_sst_register(
 		pr_err("sst card registration failed\n");
 		return ret_val;
 	}
+	sst_drv_ctx->scard_ops->card_status = SND_CARD_UN_INIT;
 
 	sst_card_vendor_id = intelmaddata->sstdrv_ops->vendor_id;
 	intelmaddata->pmic_status = PMIC_UNINIT;