From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:33310 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752582AbcEBACZ (ORCPT ); Sun, 1 May 2016 20:02:25 -0400 Subject: Patch "ASoC: dapm: Make sure we have a card when displaying component widgets" has been added to the 4.5-stable tree To: broonie@kernel.org, gregkh@linuxfoundation.org, harry.pan@intel.com, lars@metafoo.de Cc: , From: Date: Sun, 01 May 2016 17:02:24 -0700 Message-ID: <1462147344236174@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled ASoC: dapm: Make sure we have a card when displaying component widgets to the 4.5-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: asoc-dapm-make-sure-we-have-a-card-when-displaying-component-widgets.patch and it can be found in the queue-4.5 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 47325078f2a3e543150e7df967e45756b2fff7ec Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Fri, 18 Mar 2016 12:04:23 +0000 Subject: ASoC: dapm: Make sure we have a card when displaying component widgets From: Mark Brown commit 47325078f2a3e543150e7df967e45756b2fff7ec upstream. The dummy component is reused for all cards so we special case and don't bind it to any of them. This means that code like that displaying the component widgets that tries to look at the card will crash. In the future we will fix this by ensuring that the dummy component looks like other components but that is invasive and so not suitable for a fix. Instead add a special case check here. Reported-by: Harry Pan Suggested-by: Lars-Peter Clausen Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- sound/soc/soc-dapm.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -2188,6 +2188,13 @@ static ssize_t dapm_widget_show_componen int count = 0; char *state = "not set"; + /* card won't be set for the dummy component, as a spot fix + * we're checking for that case specifically here but in future + * we will ensure that the dummy component looks like others. + */ + if (!cmpnt->card) + return 0; + list_for_each_entry(w, &cmpnt->card->widgets, list) { if (w->dapm != dapm) continue; Patches currently in stable-queue which might be from broonie@kernel.org are queue-4.5/asoc-fsl_ssi-remove-explicit-register-defaults.patch queue-4.5/asoc-ssm4567-reset-device-before-regcache_sync.patch queue-4.5/asoc-dapm-make-sure-we-have-a-card-when-displaying-component-widgets.patch queue-4.5/asoc-rt5640-correct-the-digital-interface-data-select.patch queue-4.5/asoc-s3c24xx-use-const-snd_soc_component_driver-pointer.patch