Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261595AbVE3NlO (ORCPT ); Mon, 30 May 2005 09:41:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261574AbVE3NlN (ORCPT ); Mon, 30 May 2005 09:41:13 -0400 Received: from ns2.suse.de ([195.135.220.15]:4029 "EHLO mx2.suse.de") by vger.kernel.org with ESMTP id S261595AbVE3NhG (ORCPT ); Mon, 30 May 2005 09:37:06 -0400 Date: Mon, 30 May 2005 15:37:03 +0200 Message-ID: From: Takashi Iwai To: "J.A. Magallon" Cc: linux-kernel@vger.kernel.org Subject: Re: 2.6.12-rc3-mm3: ALSA broken ? In-Reply-To: <1117228680l.24619l.0l@werewolf.able.es> References: <20050504221057.1e02a402.akpm@osdl.org> <1115510869l.7472l.0l@werewolf.able.es> <1115594680l.7540l.0l@werewolf.able.es> <1115936836l.8448l.1l@werewolf.able.es> <1116331359l.7364l.0l@werewolf.able.es> <1116369585l.8840l.0l@werewolf.able.es> <1117151518l.7637l.0l@werewolf.able.es> <1117228680l.24619l.0l@werewolf.able.es> User-Agent: Wanderlust/2.10.1 (Watching The Wheels) SEMI/1.14.5 (Awara-Onsen) FLIM/1.14.5 (Demachiyanagi) APEL/10.6 MULE XEmacs/21.4 (patch 15) (Security Through Obscurity) (i386-suse-linux) MIME-Version: 1.0 (generated by SEMI 1.14.5 - "Awara-Onsen") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2542 Lines: 81 At Fri, 27 May 2005 21:18:00 +0000, J.A. Magallon wrote: > > > On 05.27, Takashi Iwai wrote: > > At Thu, 26 May 2005 23:51:58 +0000, > > J.A. Magallon wrote: > > > > > A side note. In the process of solving all this, I tried to generate a patch > > > for 1.0.9rc4a against -mm. I noticed some things: > > > - Your code reverts some in-kernel changes related to > > > if (ptr) > > > kfree(ptr) > > > The if is killed in mainline, as kfree accepts null pointers. > > > > Could you point which places? > > > > Oops, I think this is not ALSA specific code. > I took the directory alsa-kernel, in the alsa tarball, and diffed against > 2.6.12-rc5-mm1: > > --- /usr/src/linux-2.6.12-rc5-mm1/sound/core/seq/oss/seq_oss_synth.c 2005-05-27 00:25:37.000000000 +0200 > +++ alsa-kernel/core/seq/oss/seq_oss_synth.c 2005-01-20 18:42:37.000000000 +0100 > @@ -325,10 +325,14 @@ > } > snd_use_lock_free(&rec->use_lock); > } > - kfree(info->sysex); > - info->sysex = NULL; > - kfree(info->ch); > - info->ch = NULL; > + if (info->sysex) { > + kfree(info->sysex); > + info->sysex = NULL; > + } > + if (info->ch) { > + kfree(info->ch); > + info->ch = NULL; > + } > } > dp->synth_opened = 0; > dp->max_synthdev = 0; > @@ -414,10 +418,14 @@ > dp->file_mode) < 0) { > midi_synth_dev.opened--; > info->opened = 0; > - kfree(info->sysex); > - info->sysex = NULL; > - kfree(info->ch); > - info->ch = NULL; > + if (info->sysex) { > + kfree(info->sysex); > + info->sysex = NULL; > + } > + if (info->ch) { > + kfree(info->ch); > + info->ch = NULL; > + } > } > return; > } > > This looks like OSS code. Why does the tarball include OSS code ? No, it's OSS _emulation_ code :) I'll fix it on ALSA tree. Thanks. > Which is the correct way to generate a patch against a kernel tree ? Sorry, I don't understand "which" in the above question - do you mean alsa-kernel tree or what? We have a git repository, so that the latest ALSA patches can be taken... Takashi - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/