dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

sst: tweak the shared functions so we don't crash the ASoC driver 

The ASoC driver is currently pulling bits from staging rather than its own
copy. Post all the merges and fixes we've put back an assumption that
crashes ASoC so we need to fix it differently.

(See 0ed625b2f2)

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Cox 2011-05-11 14:38:26 +01:00 committed by Greg Kroah-Hartman
parent cda64a5590
commit 1dce160f02
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/intel_sst/intel_sst_drv_interface.c
View File

@ -527,7 +527,9 @@ int register_sst_card(struct intel_sst_card_ops *card)
pr_err("Repeat for registration..denied\n");
return -EBADRQC;
}
sst_drv_ctx->scard_ops->card_status = SND_CARD_UN_INIT;
/* The ASoC code doesn't set scard_ops */
if (sst_drv_ctx->scard_ops)
sst_drv_ctx->scard_ops->card_status = SND_CARD_UN_INIT;
return 0;
}
EXPORT_SYMBOL_GPL(register_sst_card);