From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFF32C2D0DB for ; Tue, 28 Jan 2020 14:36:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BDC8121739 for ; Tue, 28 Jan 2020 14:36:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580222165; bh=Obif+UBlBSM9oYuWYrkmAST6OuNiL8o9oR3skCw6FHo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=w+ThM6vOu4y2I3EivVc0UXt1whruNLGqT1mgTlWGuOftOgmErxWEyFoVXvV91YD5j Wpl+sTEEAeIZvhyYkE9d4ta+c/nvlFyq9JICr80X2uawCwuEfbltvX2xUg1pl44hBA IdGXmeoX0abzFx/IayjcTzahvh2gQ68/gKc5yXjY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729463AbgA1OgF (ORCPT ); Tue, 28 Jan 2020 09:36:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:48318 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731584AbgA1OW2 (ORCPT ); Tue, 28 Jan 2020 09:22:28 -0500 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 A0C092468F; Tue, 28 Jan 2020 14:22:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221348; bh=Obif+UBlBSM9oYuWYrkmAST6OuNiL8o9oR3skCw6FHo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qcdi88+KaZeY2yfJp9/rz73t1rJE7G8kXNZFis400oEw7Ca0H3w4HzRE0A09C94T0 wcPcQB97xNadBz/H9LLgwaTLvkNdmQ16Qo+XXAGIduwE+jWj4SXr5ULKuJHuxmFckm pRB3o4LxQoXmHGncx9Ru8DDlmt+cuggb8YLW0hxI= 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 152/271] media: vivid: fix incorrect assignment operation when setting video mode Date: Tue, 28 Jan 2020 15:05:01 +0100 Message-Id: <20200128135903.877457786@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135852.449088278@linuxfoundation.org> References: <20200128135852.449088278@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: Colin Ian King [ Upstream commit d4ec9550e4b2d2e357a46fdc65d8ef3d4d15984c ] The assigment of FB_VMODE_NONINTERLACE to var->vmode should be a bit-wise or of FB_VMODE_NONINTERLACE instead of an assignment, otherwise the previous clearing of the FB_VMODE_MASK bits of var->vmode makes no sense and is redundant. Addresses-Coverity: ("Unused value") Fixes: ad4e02d5081d ("[media] vivid: add a simple framebuffer device for overlay testing") 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-osd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/vivid/vivid-osd.c b/drivers/media/platform/vivid/vivid-osd.c index bdc380b14e0c4..a95b7c56569e3 100644 --- a/drivers/media/platform/vivid/vivid-osd.c +++ b/drivers/media/platform/vivid/vivid-osd.c @@ -167,7 +167,7 @@ static int _vivid_fb_check_var(struct fb_var_screeninfo *var, struct vivid_dev * var->nonstd = 0; var->vmode &= ~FB_VMODE_MASK; - var->vmode = FB_VMODE_NONINTERLACED; + var->vmode |= FB_VMODE_NONINTERLACED; /* Dummy values */ var->hsync_len = 24; -- 2.20.1