Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ed625b2 authored by Lu Guanqun's avatar Lu Guanqun Committed by Mark Brown
Browse files

sst: make register_sst_card more self-contained 



register_sst_card is used in ASoC code with field `scard_ops` being NULL.
Without this patch, there will be NULL dereference.

Signed-off-by: default avatarLu Guanqun <guanqun.lu@intel.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 83a3fd3c

drivers/staging/intel_sst/intel_sst_drv_interface.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/intel_sst/intelmid.c

+1 −0
Original line number Diff line number Diff line
@@ -802,6 +802,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;