Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp546138pxj; Thu, 20 May 2021 15:53:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyASiqGCbJf9o6B9PUtPWt1GLJkyARSOndPLp6ZRFUBUOnVe9UntQEGE7I6C8hSmrD/Xhbi X-Received: by 2002:a5e:8c11:: with SMTP id n17mr7997994ioj.53.1621551200110; Thu, 20 May 2021 15:53:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621551200; cv=none; d=google.com; s=arc-20160816; b=BxZ7xbimHTck2IWqglw93LP39rMV/EsFKriSb0aCz2Bgy3Hw7pF+zxXi4jNqil8Is7 0ghqF9CSInYq6HFU0u6YKzq8MJRRDLKp+ppp6fBjD67f+CQIz1K03bTJKkaav+IgeKka YOAH8oq3cVXLZqPhcp5ffb71kubPD41GB+AfSNRE+JY8O1ZfDuno2fEsAX4NlqdYo81M u378s4uX1YCxmQW1sp4TB9bwOjHj8qFf9MqIdHo7bMGB9H9uw4t7rjwaQ2NIFDsJDeVQ DtiOqGw6QbFapjrwdpqXetQZfMlRVbp/sBOkXUNnFlHJCZRrNLw0ZpIyPAAYyNnaAYjc C2Rg== 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=3itf1/xD1PGWd/nWTqvwcBZL7M8zIKtP9R/c8KlYlQ8=; b=NW+1+cCceHXOgv5dCHWwiU2Aa4GUrnQP/C1D9L5dmpKQPIFnLkbNbAYhnfI4D3SzUc 18OtrF2apUV1Jtxe4spxuWFhB4eBYoh992aB631z7ECXpxn5b5OsUUEVbPS8J+7aIOfi 3IsCqDOnejngAungK/ZZunimC0HIJoac2X4NuptJbOHIvH4k4uj7RKYX/gt5Kk8RQicb zOSVO6MikLMMxIspmVIg0GX8/JpnBgZyruAqu/jmUiE75pMKzokSnQQ6a396Pm/Ri1B9 f83/1CXJ7KWx92RqFDw57XkwntDMD13E20CfS3JBbVCzcpWBLqqQkog37iRZd/V/+Ebi Kblw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=b236TGFT; 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 g19si3727699iow.22.2021.05.20.15.53.07; Thu, 20 May 2021 15:53:20 -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=b236TGFT; 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 S240320AbhETLPy (ORCPT + 99 others); Thu, 20 May 2021 07:15:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:54402 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239343AbhETKyt (ORCPT ); Thu, 20 May 2021 06:54:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 11308616EB; Thu, 20 May 2021 10:01:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621504877; bh=p58Su/mXEqlLZWGxN//FzrObBgFLeTTpue4aC2N+oE8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b236TGFT3F2NY+TDRYWnK23Ypo9A2k0erJ9OajzkAxZbWGDQEsAAeQgdM/jqdanaF 6XMgKcOgpFxMzlytUPCGBhl62TkfE2zs5tfB3XcFur8IUevsW8+hJV2PBO6EyCE26Z 7HGpa3bo7d5rrRnuLalGV4EySosKiN2M1hDdZ888= 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.9 122/240] media: vivid: fix assignment of dev->fbuf_out_flags Date: Thu, 20 May 2021 11:21:54 +0200 Message-Id: <20210520092112.767381792@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092108.587553970@linuxfoundation.org> References: <20210520092108.587553970@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 8fed2fbe91a9..f78caf72cb3e 100644 --- a/drivers/media/platform/vivid/vivid-vid-out.c +++ b/drivers/media/platform/vivid/vivid-vid-out.c @@ -1003,7 +1003,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