From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756335AbYFPQuQ (ORCPT ); Mon, 16 Jun 2008 12:50:16 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754392AbYFPQuF (ORCPT ); Mon, 16 Jun 2008 12:50:05 -0400 Received: from ns2.suse.de ([195.135.220.15]:39028 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754352AbYFPQuE (ORCPT ); Mon, 16 Jun 2008 12:50:04 -0400 Date: Mon, 16 Jun 2008 18:50:02 +0200 Message-ID: From: Takashi Iwai To: Linus Torvalds Cc: linux-kernel@vger.kernel.org Subject: [GIT PULL] ALSA fix for 2.6.26-rc6 User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 MULE XEmacs/21.5 (beta28) (fuki) (x86_64-suse-linux) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, please pull ALSA fix for 2.6.26-rc6 from: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus Thanks! Takashi === Clemens Ladisch (1): sound: oxygen: fix NULL pointer dereference when loading snd-oxygen sound/pci/oxygen/oxygen_mixer.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c index cc0cdda..6facac5 100644 --- a/sound/pci/oxygen/oxygen_mixer.c +++ b/sound/pci/oxygen/oxygen_mixer.c @@ -936,11 +936,13 @@ static int add_controls(struct oxygen *chip, for (i = 0; i < count; ++i) { template = controls[i]; - err = chip->model->control_filter(&template); - if (err < 0) - return err; - if (err == 1) - continue; + if (chip->model->control_filter) { + err = chip->model->control_filter(&template); + if (err < 0) + return err; + if (err == 1) + continue; + } if (!strcmp(template.name, "Master Playback Volume") && chip->model->dac_tlv) { template.tlv.p = chip->model->dac_tlv;