Received: by 2002:a25:ef43:0:0:0:0:0 with SMTP id w3csp145451ybm; Tue, 26 May 2020 12:57:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUiMil2dkatqyVr49LfFtvICFGifIpaXNHoHn8qH3/vQjqTGDGOyzJ3Ks+zu7x3nNSdzOu X-Received: by 2002:a17:906:195a:: with SMTP id b26mr2570429eje.534.1590523052532; Tue, 26 May 2020 12:57:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590523052; cv=none; d=google.com; s=arc-20160816; b=NDGj21PXUUhLdMA5o+qgpWefy2UHY0vn79JyIZWkSjehRkDSuXItOJtXOml4HQKTtT zy6ui/KRimxbC1Jl7A6JI3Ik0b6F4lmL5kwoiqilyDdggP7VLDVaeT2OG5hkzdPy2TJu HosUgq+LuVOeY6R71eKJWAUiN5cTI+TG8Ybt4ap89wIJ1MafBr2Yh4NiaKQkC+xYoE4h qULlN49QP1/9PekfMs3AYZs1QMssDPS29q0i/HaC1LJOF2+6bBkv/itkkdtJ1LblX7qb misF/W+DYRyQsQA5bfYXLbi09s7i55zATByRYR2FD1FtZT0eSZMEmJRUeEaNorBhu6s4 zA2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WyFrS9EVg97UWSKctktTOOHC+lhQVuFpeeiu8BHEbK0=; b=NYgRWs7sQbWDzS9aydYpS5d4wPmr8LW9E6c/2a4hLBxzIR/vy1M/2RctJKsta4C8jE sHLRQcyQXJ/oBXW1aMswmyZixDKeJca08LnloxfgcVDEPgbqy/9UugFkIZv6KPnPCwpq zEpnHgulrzYuOhDo1ts0rVTcFAeUzCBlew1ojCZqhLpZ+YEhoAQERO0CjDTodrkW8Wfk K4eZfYzNzIZJyd+dK3jIKtusMeGLCt7SdeX2vpNracWDkqKpPTgaWHnoVw8pdnv6bLYW 6du8xJ0Dyd7ITFrOuq8AA7aNCO3nIUGS1oT686IjHTNCiUavPmMwB+Tm+kFevynJo4tQ KeVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="XSfo6/N/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g20si477262ejk.53.2020.05.26.12.57.07; Tue, 26 May 2020 12:57:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="XSfo6/N/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404282AbgEZTNa (ORCPT + 99 others); Tue, 26 May 2020 15:13:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:43414 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404264AbgEZTNZ (ORCPT ); Tue, 26 May 2020 15:13:25 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3A93120888; Tue, 26 May 2020 19:13:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590520404; bh=XvJDTNIF45o9UFGQKYua3tOzrBKSO1492EQJkze+mBE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XSfo6/N/jWFQguyr9yQzeamwDTmqm+3oF3Yq27pvCjUabQ4aTpju4mWmS34qqjZtp KPi01VIUXZKU0joC/nrWQZWraRKdLJ1X/yq1WA4FDuU5bGtCy8TPPGoab64aVCQqR9 j22It7fWQ9gX59UA2O4jkhKzHuwzkFFyM5eLVTYE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Scott Bahling , Takashi Iwai Subject: [PATCH 5.6 064/126] ALSA: iec1712: Initialize STDSP24 properly when using the model=staudio option Date: Tue, 26 May 2020 20:53:21 +0200 Message-Id: <20200526183943.534486974@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200526183937.471379031@linuxfoundation.org> References: <20200526183937.471379031@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Scott Bahling commit b0cb099062b0c18246c3a20caaab4c0afc303255 upstream. The ST Audio ADCIII is an STDSP24 card plus extension box. With commit e8a91ae18bdc ("ALSA: ice1712: Add support for STAudio ADCIII") we enabled the ADCIII ports using the model=staudio option but forgot this part to ensure the STDSP24 card is initialized properly. Fixes: e8a91ae18bdc ("ALSA: ice1712: Add support for STAudio ADCIII") Signed-off-by: Scott Bahling Cc: BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1048934 Link: https://lore.kernel.org/r/20200518175728.28766-1-tiwai@suse.de Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/pci/ice1712/ice1712.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c @@ -2332,7 +2332,8 @@ static int snd_ice1712_chip_init(struct pci_write_config_byte(ice->pci, 0x61, ice->eeprom.data[ICE_EEP1_ACLINK]); pci_write_config_byte(ice->pci, 0x62, ice->eeprom.data[ICE_EEP1_I2SID]); pci_write_config_byte(ice->pci, 0x63, ice->eeprom.data[ICE_EEP1_SPDIF]); - if (ice->eeprom.subvendor != ICE1712_SUBDEVICE_STDSP24) { + if (ice->eeprom.subvendor != ICE1712_SUBDEVICE_STDSP24 && + ice->eeprom.subvendor != ICE1712_SUBDEVICE_STAUDIO_ADCIII) { ice->gpio.write_mask = ice->eeprom.gpiomask; ice->gpio.direction = ice->eeprom.gpiodir; snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK,