Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp978355ybt; Wed, 17 Jun 2020 19:44:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2MnTY5I7vZ9AKJ5KTO2D+vi0MDCGAm1L8irO5zQyU6LcC5nOKWieWll4TKxLURqv+A+Wp X-Received: by 2002:a17:906:7746:: with SMTP id o6mr2035285ejn.75.1592448274083; Wed, 17 Jun 2020 19:44:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592448274; cv=none; d=google.com; s=arc-20160816; b=AEC2jmaiKL2hyPV3xE4ULxVxC9c4J96ZCLkcDiQzojaUBYZhQYIJ45jm7xfT8/zA0O gsZx8wbv/zc8fLjj9GwafJ0Gk+KcZLQ29e3fcCQ/mviwvwB54/4sD+OB3ZsZCQnGcWdl EN4px6TQMvBrJ9JFFr1w2oCtBnnzp90MsN5oS4FqprVMkJbfZIRuvO5usxEZDTn6Dp5Z nOib3RASVsva3seFjGumfJpoW1TT4ck3iWbDehpNN4wQdJMob7gu00pyopUrT4wg+GmM KTcA3dKzkdIGU+ipt4ET9XQDT0E+0TsN5oBARYhQ9v0qrbiON97xO4a+wW++v2LJPKg2 NUVg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ioVJEYEduD0EemLVIjdBQKy5B7tTnB7cFpCTugCdV2g=; b=kYuqm2K92jKLZ2fjQ33SB6WNgmBuYAFpEgLlco3P6w58ehW1askG6Ur8j8xcXOtis2 FM02MRaCYPTrAj6B/S5/KgjDxDBkic1ysO8HlbljOn7mWbEQSleveFQQJrBaAmiI+vOd WShGTg4LEc39AkFC1SovsakBo6an524Cle2HLKDYk1Y+mATAnyrxBTiwBcaXKUSItcbV d4Gw9H7PoTg+HaC5SnMqI7cUeUphiRrfy8Vfw4ycgXk45wkeCr7uySNvO0HbW4crtg+x gwnQMEGcau/44ET/MKzz6rAZrr5RICyuEFMRvDydz6umAFFaXnekfQ7V0nHaLB0pRMJG K6Cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZtSc+a9I; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p27si718141eji.153.2020.06.17.19.44.11; Wed, 17 Jun 2020 19:44:34 -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=ZtSc+a9I; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729133AbgFRCmf (ORCPT + 99 others); Wed, 17 Jun 2020 22:42:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:40280 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728058AbgFRBMA (ORCPT ); Wed, 17 Jun 2020 21:12:00 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EAD5620B1F; Thu, 18 Jun 2020 01:11:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442720; bh=kUGcVXRVxnsE4PRZ85J75kYg4bxTrLdCNBvOPXpXS+4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZtSc+a9ItfJqkqBqCrSpapQcOrp7woz42A/VdQtO8jUSZ+0/Qbh1zEfkecznP+Mcb nnYinHym0SdxNAkBHnpMi8kypxavKK/Cxk4dJ2YAegn1ZDUf2ZmIGJoo+s4lJu6OOc byaHUKFZ08ZJRewbdgB/jSHIhtCNJO5NTfpH1A4M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Takashi Sakamoto , Takashi Iwai , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.7 179/388] ALSA: firewire-lib: fix invalid assignment to union data for directional parameter Date: Wed, 17 Jun 2020 21:04:36 -0400 Message-Id: <20200618010805.600873-179-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Takashi Sakamoto [ Upstream commit 8304cf77c92038cd1c50c27b69d30be695cc8003 ] Although the value of FDF is used just for outgoing stream, the assignment to union member is done for both directions of stream. At present this causes no issue because the value of same position is reassigned later for opposite stream. However, it's better to add if statement. Fixes: d3d10a4a1b19 ("ALSA: firewire-lib: use union for directional parameters") Signed-off-by: Takashi Sakamoto Link: https://lore.kernel.org/r/20200508043635.349339-2-o-takashi@sakamocchi.jp Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/firewire/amdtp-am824.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/firewire/amdtp-am824.c b/sound/firewire/amdtp-am824.c index 67d735e9a6a4..fea92e148790 100644 --- a/sound/firewire/amdtp-am824.c +++ b/sound/firewire/amdtp-am824.c @@ -82,7 +82,8 @@ int amdtp_am824_set_parameters(struct amdtp_stream *s, unsigned int rate, if (err < 0) return err; - s->ctx_data.rx.fdf = AMDTP_FDF_AM824 | s->sfc; + if (s->direction == AMDTP_OUT_STREAM) + s->ctx_data.rx.fdf = AMDTP_FDF_AM824 | s->sfc; p->pcm_channels = pcm_channels; p->midi_ports = midi_ports; -- 2.25.1