From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262427AbTKNLQl (ORCPT ); Fri, 14 Nov 2003 06:16:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262429AbTKNLQl (ORCPT ); Fri, 14 Nov 2003 06:16:41 -0500 Received: from ns.suse.de ([195.135.220.2]:15513 "EHLO Cantor.suse.de") by vger.kernel.org with ESMTP id S262427AbTKNLQj (ORCPT ); Fri, 14 Nov 2003 06:16:39 -0500 Date: Fri, 14 Nov 2003 12:16:37 +0100 Message-ID: From: Takashi Iwai To: Erik Mouw Cc: linux-kernel@vger.kernel.org Subject: Re: [BUG 2.6.0-test9] sleep from invalid function (ALSA related?) In-Reply-To: <20031113113316.GA30460@bitwizard.nl> References: <20031113113316.GA30460@bitwizard.nl> 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 13) (Rational FORTRAN) (i386-suse-linux) MIME-Version: 1.0 (generated by SEMI 1.14.5 - "Awara-Onsen") Content-Type: multipart/mixed; boundary="Multipart_Fri_Nov_14_12:16:37_2003-1" Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org --Multipart_Fri_Nov_14_12:16:37_2003-1 Content-Type: text/plain; charset=US-ASCII At Thu, 13 Nov 2003 12:33:16 +0100, Erik Mouw wrote: > > Hi, > > I compiled 2.6.0-test9 on my desktop last night. Not too many problems > so far, but this debug trace caught my attention: (snip) > It looks ALSA related to me, the soundcard I use is a Midiman > Audiophile 2496, which uses the ice1712 driver. the attached patch should fix. please give a try. -- Takashi Iwai ALSA Developer - www.alsa-project.org --Multipart_Fri_Nov_14_12:16:37_2003-1 Content-Type: application/octet-stream Content-Disposition: attachment; filename="i2c-lock-fix.dif" Content-Transfer-Encoding: 7bit diff -ru linux/include/sound linux/include/sound --- linux/include/sound/i2c.h 23 Apr 2002 13:20:58 -0000 1.3 +++ linux/include/sound/i2c.h 13 Nov 2003 11:18:12 -0000 1.4 @@ -58,7 +58,7 @@ snd_card_t *card; /* card which I2C belongs to */ char name[32]; /* some useful label */ - spinlock_t lock; + struct semaphore lock_mutex; snd_i2c_bus_t *master; /* master bus when SCK/SCL is shared */ struct list_head buses; /* master: slave buses sharing SCK/SCL, slave: link list */ @@ -84,15 +84,15 @@ static inline void snd_i2c_lock(snd_i2c_bus_t *bus) { if (bus->master) - spin_lock(&bus->master->lock); + down(&bus->master->lock_mutex); else - spin_lock(&bus->lock); + down(&bus->lock_mutex); } static inline void snd_i2c_unlock(snd_i2c_bus_t *bus) { if (bus->master) - spin_unlock(&bus->master->lock); + up(&bus->master->lock_mutex); else - spin_unlock(&bus->lock); + up(&bus->lock_mutex); } int snd_i2c_sendbytes(snd_i2c_device_t *device, unsigned char *bytes, int count); diff -ru linux/sound linux/sound --- linux/sound/i2c/i2c.c 2 Jun 2003 10:04:44 -0000 1.7 +++ linux/sound/i2c/i2c.c 13 Nov 2003 11:18:25 -0000 1.8 @@ -84,7 +84,7 @@ bus = (snd_i2c_bus_t *)snd_magic_kcalloc(snd_i2c_bus_t, 0, GFP_KERNEL); if (bus == NULL) return -ENOMEM; - spin_lock_init(&bus->lock); + init_MUTEX(&bus->lock_mutex); INIT_LIST_HEAD(&bus->devices); INIT_LIST_HEAD(&bus->buses); bus->card = card; --Multipart_Fri_Nov_14_12:16:37_2003-1--