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:
parent
cda64a5590
commit
1dce160f02
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue