From: Takashi Iwai Subject: Re: [PATCH 2/2] ALSA: usb-audio: Fix missing autopm for MIDI input Date: Tue, 04 Dec 2012 08:01:17 +0100 Message-ID: References: <1354531738-22046-1-git-send-email-tiwai@suse.de> <1354531738-22046-3-git-send-email-tiwai@suse.de> <50BD0FF4.50301@ladisch.de> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 0E60A26166B for ; Tue, 4 Dec 2012 08:01:18 +0100 (CET) In-Reply-To: <50BD0FF4.50301@ladisch.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Clemens Ladisch Cc: Jonathan Nieder , David Banks , alsa-devel@alsa-project.org, Olivier MATZ List-Id: alsa-devel@alsa-project.org At Mon, 03 Dec 2012 21:47:48 +0100, Clemens Ladisch wrote: > > Takashi Iwai wrote: > > The commit [88a8516a: ALSA: usbaudio: implement USB autosuspend] added > > the support of autopm for USB MIDI output, but it didn't take the MIDI > > input into account. > > > > This patch adds the following for fixing the autopm: > > - Manage the URB start at the first MIDI input stream open, instead of > > the time of instance creation > > - Move autopm code to the common substream_open() > > - Make snd_usbmidi_input_start/_stop() more robust and add the running > > state check > > > > Cc: > > Signed-off-by: Takashi Iwai > > ... > > +static int substream_open(struct snd_rawmidi_substream *substream, int dir, > > + int open) > > { > > struct snd_usb_midi* umidi = substream->rmidi->private_data; > > struct snd_kcontrol *ctl; > > + int err; > > > > down_read(&umidi->disc_rwsem); > > if (umidi->disconnected) { > > up_read(&umidi->disc_rwsem); > > + return open ? -ENODEV : 0; > > } > > > > mutex_lock(&umidi->mutex); > > if (open) { > > + if (!umidi->opened[0] && !umidi->opened[1]) { > > + err = usb_autopm_get_interface(umidi->iface); > > + umidi->autopm_reference = err >= 0; > > + if (err < 0 && err != -EACCES) { > > + up_read(&umidi->disc_rwsem); > > + return -EIO; > > umidi->mutex is still held here. Right, fixed. > Otherwise, for both patches: > Reviewd-by: Clemens Ladisch > Tested-by: Clemens Ladisch OK, I merged the fixed patches and pushed out. Thanks! Takashi