From patchwork Thu Sep 20 06:58:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 1482831 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 23A0FDF2D2 for ; Thu, 20 Sep 2012 06:58:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753026Ab2ITG6z (ORCPT ); Thu, 20 Sep 2012 02:58:55 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:52628 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752927Ab2ITG6y (ORCPT ); Thu, 20 Sep 2012 02:58:54 -0400 Received: from axis700.grange (dslb-178-009-250-012.pools.arcor-ip.net [178.9.250.12]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0MEaVh-1TH0Ua1LKL-00FcU4; Thu, 20 Sep 2012 08:58:49 +0200 Received: by axis700.grange (Postfix, from userid 1000) id C391E189B0D; Thu, 20 Sep 2012 08:58:48 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id C1546189AF7; Thu, 20 Sep 2012 08:58:48 +0200 (CEST) Date: Thu, 20 Sep 2012 08:58:48 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: Linux Media Mailing List cc: Hans Verkuil Subject: [PATCH] media: sh-vou: fix compilation breakage Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:aFAKLGzFHEEx97ppkn3gycgvT187uVtd3a5Y0PUt1Iq kC6LbihKwPLL/9blurhxosvYXJkIBxL8B52A9qjY4hsXgDtjJZ RUYPgKK5NSAuodqZLspxlYzV2z7OOSqJNg735SCstoXPCrPEyv apl6yhg/NPS+xhI/worXLLDL8lkuO5P06uSbEfcEU1VDWbnslB ncYTjEaLZdXQkcySaZ5C5C5Iali+Ao5qIiNBmjbU0ng0uRVovk KVz1nkPPp/xZx5oVMubtIz5c6AR9iUXG7WhYozY1ezoqRA613D kMtqaqD+8QSTVUMeq0e05BXzBVaYnsGal4mtmgKBOx3TAe1nH4 6mxgxE6nKQoNNnRlYABe8XasG1oQi9g4fwyVjqtHMB4602OJI9 co5TpMC+/OxTw== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org A recent commit commit f135a8a224294fa0f60ec1b8bc120813b7cfc804 Author: Hans Verkuil Date: Sun Jun 24 06:33:26 2012 -0300 [media] sh_vou: remove V4L2_FL_LOCK_ALL_FOPS broke compilation of sh_vou.c: drivers/media/platform/sh_vou.c: In function 'sh_vou_mmap': drivers/media/platform/sh_vou.c:1227: error: 'vdev' undeclared (first use in this function) drivers/media/platform/sh_vou.c:1227: error: (Each undeclared identifier is reported only once drivers/media/platform/sh_vou.c:1227: error: for each function it appears in.) drivers/media/platform/sh_vou.c: In function 'sh_vou_poll': drivers/media/platform/sh_vou.c:1242: error: 'vdev' undeclared (first use in this function) make[2]: *** [drivers/media/platform/sh_vou.o] Error 1 Add missing variable definitions. Signed-off-by: Guennadi Liakhovetski Acked-by: Hans Verkuil --- This is a fix for 3.7 drivers/media/platform/sh_vou.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c index 9f62fd8..7f8b792 100644 --- a/drivers/media/platform/sh_vou.c +++ b/drivers/media/platform/sh_vou.c @@ -1224,6 +1224,7 @@ static int sh_vou_release(struct file *file) static int sh_vou_mmap(struct file *file, struct vm_area_struct *vma) { + struct video_device *vdev = video_devdata(file); struct sh_vou_device *vou_dev = video_get_drvdata(vdev); struct sh_vou_file *vou_file = file->private_data; int ret; @@ -1239,6 +1240,7 @@ static int sh_vou_mmap(struct file *file, struct vm_area_struct *vma) static unsigned int sh_vou_poll(struct file *file, poll_table *wait) { + struct video_device *vdev = video_devdata(file); struct sh_vou_device *vou_dev = video_get_drvdata(vdev); struct sh_vou_file *vou_file = file->private_data; unsigned int res;