Unverified Commit 78e4f82c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8273 ALSA: hda: Do not unset preset when cleaning up codec 

Merge Pull Request from: @ci-robot 
 
PR sync from: Ye Bin <yebin10@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/WVHZU5ZAR5YHDLMP36CMXAQNYM3L5U2C/ 
 
https://gitee.com/openeuler/kernel/issues/I9R4NC 
 
Link:https://gitee.com/openeuler/kernel/pulls/8273

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents f107a15a 9249e39a

sound/pci/hda/hda_bind.c

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ static int hda_codec_driver_probe(struct device *dev) 


 error:

	snd_hda_codec_cleanup_for_unbind(codec);

	codec->preset = NULL;

	return err;

}
@@ -159,6 +160,7 @@ static int hda_codec_driver_remove(struct device *dev) 
	if (codec->patch_ops.free)

		codec->patch_ops.free(codec);

	snd_hda_codec_cleanup_for_unbind(codec);

	codec->preset = NULL;

	module_put(dev->driver->owner);

	return 0;

}

sound/pci/hda/hda_codec.c

+0 −1
Original line number Diff line number Diff line
@@ -784,7 +784,6 @@ void snd_hda_codec_cleanup_for_unbind(struct hda_codec *codec) 
	snd_array_free(&codec->cvt_setups);

	snd_array_free(&codec->spdif_out);

	snd_array_free(&codec->verbs);

	codec->preset = NULL;

	codec->follower_dig_outs = NULL;

	codec->spdif_status_reset = 0;

	snd_array_free(&codec->mixers);