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 9FCFAC32771 for ; Fri, 24 Jan 2020 09:52:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6D8E020718 for ; Fri, 24 Jan 2020 09:52:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859569; bh=DTzS7/xMcw4MB5IeIYo9NeKjeT4fBH68jiJAbPCx9Ms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZKp56s1KMcCtHfBR/r3X+9L1K95G/bLjkO/IPQacQkzi/RbR4ZMBgonxKNNvBdIl1 TQEr39EsnEVbzxSWo/goSo6BKDPYva8GP32Yv75JvSSduE7AkrUaZmPnnZi9ZFt2qo imYckTWxbByhrPzZYtRxRUeRd5YIbDWi6phUe/J8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388189AbgAXJws (ORCPT ); Fri, 24 Jan 2020 04:52:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:54748 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731453AbgAXJwp (ORCPT ); Fri, 24 Jan 2020 04:52:45 -0500 Received: from localhost (unknown [145.15.244.15]) (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 8AC3D214AF; Fri, 24 Jan 2020 09:52:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859565; bh=DTzS7/xMcw4MB5IeIYo9NeKjeT4fBH68jiJAbPCx9Ms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RQ2+fxuCr99HQ2vB3vDl1afSRpN2RKaAYh6YspTss8KM5TX83He/uk5Hu+GbF6imf 9S4vLguIs8lM6pZyxMnh9X9ldEwuCOn7oqzRZ3ClkNbmXNeUb3+bvg90Dqdvbkbwy/ DaYMS/sCvKy7ewW8zDclddnBoBIXAKhKe6F6TMdA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.14 144/343] media: ivtv: update *pos correctly in ivtv_read_pos() Date: Fri, 24 Jan 2020 10:29:22 +0100 Message-Id: <20200124092938.941073195@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@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: Dan Carpenter [ Upstream commit f8e579f3ca0973daef263f513da5edff520a6c0d ] We had intended to update *pos, but the current code is a no-op. Fixes: 1a0adaf37c30 ("V4L/DVB (5345): ivtv driver for Conexant cx23416/cx23415 MPEG encoder/decoder") Signed-off-by: Dan Carpenter Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/pci/ivtv/ivtv-fileops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/pci/ivtv/ivtv-fileops.c b/drivers/media/pci/ivtv/ivtv-fileops.c index c9bd018e53de6..e2b19c3eaa876 100644 --- a/drivers/media/pci/ivtv/ivtv-fileops.c +++ b/drivers/media/pci/ivtv/ivtv-fileops.c @@ -420,7 +420,7 @@ static ssize_t ivtv_read_pos(struct ivtv_stream *s, char __user *ubuf, size_t co IVTV_DEBUG_HI_FILE("read %zd from %s, got %zd\n", count, s->name, rc); if (rc > 0) - pos += rc; + *pos += rc; return rc; } -- 2.20.1