---

yaml --- r: 249599 b: refs/heads/master c: 1dce160 h: refs/heads/master i: 249597: 3aba2a0 249595: c8b1b26 249591: 8d5ce0f 249583: 88b434c 249567: a849cd7 249535: f18d996 249471: 0e99fd1 249343: bd5b9c4 v: v3
git-mirror · May 11, 2011 · c8671a1 · c8671a1
1 parent ea131bd
commit c8671a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cda64a5590fcb7349416479ad783ac2dcb20b677
+refs/heads/master: 1dce160f027763253c316f5bcd3cc7b686d988d2
diff --git a/trunk/drivers/staging/intel_sst/intel_sst_drv_interface.c b/trunk/drivers/staging/intel_sst/intel_sst_drv_interface.c
@@ -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);