Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp64187pxj; Thu, 20 May 2021 04:40:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyWfZvRp7IWuJj1SHp/gd6lWNVwsWQq4IYWbgbA2QdIS90ihEjIKMM7GM7VekW9Q8WsA80w X-Received: by 2002:a17:906:1f54:: with SMTP id d20mr4243155ejk.94.1621510814799; Thu, 20 May 2021 04:40:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621510814; cv=none; d=google.com; s=arc-20160816; b=VRFUhVbl4fPUCNyIwHP6vgrHi/jb9n1q4n+1U71Jghs7Rn/hJdt9ZIajQ1StfTXbrq asxOCw9L96nFiY190asFHywV1jflb2VzkWykI+LmvzF5FoAgnuNLbxdPQH9LIIQJKMw2 YUiWUgbts6QblCvkdbZJ9rFWCByk6cSY2KuA7N3w+FzpLvBtLK48waBo1O73+RECs3G1 tveFWfbQxp2aNNig5cIBfnV82ZpY+rBpAIZNH/xttvZ781CJ0o91kETm8I4w0837DKVU h0g1GjvXvFUoRAxNyfq1yBHWbDLPgaAZsOxL6ZYKqjUvs/Nd+/u5dnOuFOuv21fKRFnD /9uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=NkAlXMOingXSfcwKh0zdVv1M5K+nLzl7I24VAMHTVYY=; b=sIzBxzzWxVmI+kZjCd/6d6u0mm6lFYWcNjBG+A/RjN4dOm6JR/JDNp/NgRueYOaaTa j++QEd5VpuhqueiGraTm4GYmSh+BddVVIvawrxG/vMD5QcCHbBOCrQHaFhZWPofESwCQ l/uyfhVhQX7G5+LPuOhbf9fh/gFUJcBCZviDfImnGS9EGNdEmkdYUneyE1fQ/Bn4mn6b DUPxKmp58VI4z/B58qpLLdphb1hydcY8hA4mvjyTY2YLWuqc7inMZexanhkNxkIkmmar kd3SvIGYLTEpXq9Of1mXgKGO61l8wRfjELA97idBYHbHPmptLDpZSt26JNiIMhsSD9fq Rldw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=eTz6Sr6v; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z26si2340089eje.396.2021.05.20.04.39.51; Thu, 20 May 2021 04:40:14 -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=@linuxfoundation.org header.s=korg header.b=eTz6Sr6v; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239689AbhETLgw (ORCPT + 99 others); Thu, 20 May 2021 07:36:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:39586 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240492AbhETLQe (ORCPT ); Thu, 20 May 2021 07:16:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0E42B61D64; Thu, 20 May 2021 10:09:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621505355; bh=kmNmRSAoD7p0OiOHCXrtryah4sVs2Vf2RGBzDtF5D/A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eTz6Sr6vHCk4EcJeDPC5v0N5LmbhmCcPgXtssuunDmVGt2Qetd863UU2zYaat7gVD WptarjiGRDOladz7RDzTaxLW0zssu53nZcEAVqyZKl34xaYVLhj2HiLpXJ2sz+2sz9 if2F0gWGuhF0yT1UKjrkPDv1uPsPDouGb8ecrIAA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Colin Ian King , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.4 097/190] media: vivid: fix assignment of dev->fbuf_out_flags Date: Thu, 20 May 2021 11:22:41 +0200 Message-Id: <20210520092105.403910522@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092102.149300807@linuxfoundation.org> References: <20210520092102.149300807@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Colin Ian King [ Upstream commit 5cde22fcc7271812a7944c47b40100df15908358 ] Currently the chroma_flags and alpha_flags are being zero'd with a bit-wise mask and the following statement should be bit-wise or'ing in the new flag bits but instead is making a direct assignment. Fix this by using the |= operator rather than an assignment. Addresses-Coverity: ("Unused value") Fixes: ef834f7836ec ("[media] vivid: add the video capture and output parts") Signed-off-by: Colin Ian King Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/vivid/vivid-vid-out.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/vivid/vivid-vid-out.c b/drivers/media/platform/vivid/vivid-vid-out.c index ffe5531dfc81..7f6fa77e4775 100644 --- a/drivers/media/platform/vivid/vivid-vid-out.c +++ b/drivers/media/platform/vivid/vivid-vid-out.c @@ -1011,7 +1011,7 @@ int vivid_vid_out_s_fbuf(struct file *file, void *fh, return -EINVAL; } dev->fbuf_out_flags &= ~(chroma_flags | alpha_flags); - dev->fbuf_out_flags = a->flags & (chroma_flags | alpha_flags); + dev->fbuf_out_flags |= a->flags & (chroma_flags | alpha_flags); return 0; } -- 2.30.2