diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-05-22 08:01:33 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-05-22 08:01:33 (GMT) |
commit | 7ec298dfef00e2c8effe8658011e03d86911b0bf (patch) | |
tree | dd62232006547b861a2731fe49c26367d3e9422c /drivers | |
parent | 02e5fbf622aabf68bdc02282a17a3aeed054237a (diff) | |
parent | de0853c000aa3b5c9983d066c137e5dc9c8355a0 (diff) | |
download | linux-fsl-qoriq-7ec298dfef00e2c8effe8658011e03d86911b0bf.tar.xz |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/intel_sst/intel_sst_drv_interface.c | 1 | ||||
-rw-r--r-- | drivers/staging/intel_sst/intelmid.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/intel_sst/intel_sst_drv_interface.c b/drivers/staging/intel_sst/intel_sst_drv_interface.c index e9c1821..971588c 100644 --- a/drivers/staging/intel_sst/intel_sst_drv_interface.c +++ b/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/drivers/staging/intel_sst/intelmid.c b/drivers/staging/intel_sst/intelmid.c index d207636..ebb6d03 100644 --- a/drivers/staging/intel_sst/intelmid.c +++ b/drivers/staging/intel_sst/intelmid.c @@ -32,6 +32,7 @@ #include <linux/platform_device.h> #include <linux/interrupt.h> #include <linux/sched.h> +#include <linux/firmware.h> #include <sound/control.h> #include <asm/mrst.h> #include <sound/pcm.h> @@ -40,6 +41,8 @@ #include <sound/initval.h> #include "intel_sst.h" #include "intel_sst_ioctl.h" +#include "intel_sst_fw_ipc.h" +#include "intel_sst_common.h" #include "intelmid_snd_control.h" #include "intelmid.h" @@ -802,6 +805,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; |