Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965399AbbHDPSN (ORCPT ); Tue, 4 Aug 2015 11:18:13 -0400 Received: from mx2.suse.de ([195.135.220.15]:58801 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754076AbbHDOlS (ORCPT ); Tue, 4 Aug 2015 10:41:18 -0400 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Takashi Iwai , Jiri Slaby Subject: [PATCH 3.12 019/123] ALSA: usb-audio: Save mixer status only once at suspend Date: Tue, 4 Aug 2015 16:39:23 +0200 Message-Id: <818893063ca19147075f2d1a966ff181a78e1869.1438699154.git.jslaby@suse.cz> X-Mailer: git-send-email 2.5.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1390 Lines: 43 From: Takashi Iwai 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit 1c53e7253ed8769a00afa0f06777d731dbe1ba6f upstream. The suspend callback of usb-audio driver may be called multiple times per suspend when multiple USB interfaces are bound to a single sound card instance. In such a case, it's superfluous to save the mixer values multiple times. This patch fixes it by checking the counter. Signed-off-by: Takashi Iwai Signed-off-by: Jiri Slaby --- sound/usb/card.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/usb/card.c b/sound/usb/card.c index 3ab9fc47da09..ca55e033cf9d 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -705,8 +705,9 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message) chip->autosuspended = 1; } - list_for_each_entry(mixer, &chip->mixer_list, list) - snd_usb_mixer_suspend(mixer); + if (chip->num_suspended_intf == 1) + list_for_each_entry(mixer, &chip->mixer_list, list) + snd_usb_mixer_suspend(mixer); return 0; } -- 2.5.0 -- 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/