Received: by 2002:a25:ef43:0:0:0:0:0 with SMTP id w3csp130338ybm; Tue, 26 May 2020 12:31:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzSHYCbYCYTmZqgr1ICoiu6BHsVbVInUp8OE9IEjlBgOzq7eJLZL5LMLNFnBXyJAcb39MS5 X-Received: by 2002:a17:906:eb83:: with SMTP id mh3mr2341991ejb.361.1590521508823; Tue, 26 May 2020 12:31:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590521508; cv=none; d=google.com; s=arc-20160816; b=gZJbfOSkSTnAwTiselDhfYCVFVaHfxROanfPMmyEgLdWH7BDkp2QtM5W4M5DOPILwF PgrT8JcBoH2EwnuDTdhM3bEiFp4i6/5U4cTBSfkEbtatMxDpyLxHzNkAl9n6FENrLOTI 3r2sUn97MULRLbfmgsNcWCFSZT0sZVrWbX1cb+26bXVKf0eTzRaEe6vaHDFjhtQ+7v19 8f/K7gP5sT+vr+Igue43687OPq7txg6IqGIgjG10I/GYq0MRTa7bcJhHUJm+sZ1t3Vvi iU/py4jHc+/468F1KsIqv+Gf4H9AXiVcVt7Aj/NIcy9dyIQ24zN0fT5bJ+rr8LuRCYmJ MI7g== 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=sCYkRFyhZNm/RPuhPUkftKEXT2/GVVcfegBuIHMJeSg=; b=lJRxAHr7xkEyo+ID7QOBfrdJarP5IxS8MbBnGpnchhH0Jah8OuHof6Ta+61Le2pCt/ r5Je6TThvGuwFEOFPvRDZiQkSnhGfHsSROePz8xtg6AHfOGAzK0LnUybeUHiCuGMrvst DsfEWsRrLHphgNIONl8hr1uWqmVnzr+rFngGcNf0wBigY+sntxRv+0cA9379NBjXqGx/ 4UmsggO6w/RG3OzmIqXdUCwQyr+bHYNHahmWl/EFqMZmFuBmbZDTj8K4PBkmaFVEXKKy nbz4hhfD4pBrk+xVDhRy6X5HhXIwyfmnrdzifuAduJZZqYUwGKV+TVDiPCOupL+0OCmW UMpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=mPovLgUO; 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 ns21si463708ejb.343.2020.05.26.12.31.25; Tue, 26 May 2020 12:31:48 -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=mPovLgUO; 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 S2391654AbgEZT2o (ORCPT + 99 others); Tue, 26 May 2020 15:28:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:57576 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391135AbgEZTCk (ORCPT ); Tue, 26 May 2020 15:02:40 -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 4804720849; Tue, 26 May 2020 19:02:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590519759; bh=egsL6AH/ANsTTekNKP3t3n4xT4+RurSQuBnpdQfJb/c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mPovLgUOgIVMFD5jet8oYmakFYiyBxEoOwgcmbugFrilP4DG+qTh7A77C/X6dfJri kVIsaU595UD37ofyFXFKbg95rW+Wjchjehh23w5mTv9+BKTF70+FH11Vb85BUtf6XT 7qIfGUQphpztuGUvkbI0n58LU1CjldJ8tQ/66Xg0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Scott Bahling , Takashi Iwai Subject: [PATCH 4.14 35/59] ALSA: iec1712: Initialize STDSP24 properly when using the model=staudio option Date: Tue, 26 May 2020 20:53:20 +0200 Message-Id: <20200526183919.093179911@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200526183907.123822792@linuxfoundation.org> References: <20200526183907.123822792@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 @@ -2377,7 +2377,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,