From 35bf0641522a9683e16f4b2a34a93b6e965af80e Mon Sep 17 00:00:00 2001 From: Lu Guanqun Date: Wed, 6 Apr 2011 10:20:42 +0800 Subject: [PATCH] --- yaml --- r: 248258 b: refs/heads/master c: 0ed625b2f2751c249417bd28694e37ef48eb5fbb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/intel_sst/intel_sst_drv_interface.c | 1 - trunk/drivers/staging/intel_sst/intelmid.c | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 05cd1506aa52..11e70e102e59 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83a3fd3cf0bfdadfdfc633f6437f9121e28252b9 +refs/heads/master: 0ed625b2f2751c249417bd28694e37ef48eb5fbb 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 ea8e251b5099..cf10dd606638 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 fb2292186703..1fb39d4f98e2 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;