Commit 1dce160f authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman

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 0ed625b2)
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cda64a55
...@@ -527,7 +527,9 @@ int register_sst_card(struct intel_sst_card_ops *card) ...@@ -527,7 +527,9 @@ int register_sst_card(struct intel_sst_card_ops *card)
pr_err("Repeat for registration..denied\n"); pr_err("Repeat for registration..denied\n");
return -EBADRQC; 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; return 0;
} }
EXPORT_SYMBOL_GPL(register_sst_card); EXPORT_SYMBOL_GPL(register_sst_card);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment