From patchwork Thu Apr 29 03:42:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederic Weisbecker X-Patchwork-Id: 95860 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3T3ibF4022704 for ; Thu, 29 Apr 2010 03:44:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932349Ab0D2Dnv (ORCPT ); Wed, 28 Apr 2010 23:43:51 -0400 Received: from mail-ww0-f46.google.com ([74.125.82.46]:44510 "EHLO mail-ww0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756207Ab0D2Dmt (ORCPT ); Wed, 28 Apr 2010 23:42:49 -0400 Received: by wwi14 with SMTP id 14so1334934wwi.19 for ; Wed, 28 Apr 2010 20:42:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:x-mailer-version:in-reply-to:references; bh=A/X0Z4qxQCLrf0as2ZBpLNV3DYlHcMmAyQOACjpPR44=; b=p4nEWEXD7cZBzKH82ObzczXtV7AfyJQMroDWjOVAzWNN49x0wqeE04+4JFVR1K0L9v vcdNZ/E/rzKnmeFTaHU62gSa6rZZv+3JwEDFEOeo6f0759gIOUx0V1wQb9RdM5It0h7m ICgibv/Qwo2aYFz6Ru5iG3y17CmdwLH9j2SPg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:x-mailer-version :in-reply-to:references; b=TDhojqi+5CrTwkAFPdieSqYAcAS/HPQgkkrPa4UsssqZvnGCglhYOxn5Gz76spULKy zaAJh1QGLomBJbh/9q1VJrH969Z7m6GcE/oMyMy2YPjKk9FPq+bY9fmqlESSMnR4rZLH BGQCmhz6Bkrd9PvmVtrZU/8J5jyoQWam4WJ6A= Received: by 10.216.87.134 with SMTP id y6mr2829452wee.20.1272512567706; Wed, 28 Apr 2010 20:42:47 -0700 (PDT) Received: from localhost.localdomain (ADijon-551-1-34-36.w90-26.abo.wanadoo.fr [90.26.105.36]) by mx.google.com with ESMTPS id x1sm3671682wbx.13.2010.04.28.20.42.46 (version=SSLv3 cipher=RC4-MD5); Wed, 28 Apr 2010 20:42:47 -0700 (PDT) From: Frederic Weisbecker To: LKML Cc: LKML , Frederic Weisbecker , Laurent Pinchart , Hans Verkuil , Arnd Bergmann , John Kacur , Linus Torvalds , Jan Blunck , Thomas Gleixner , Mauro Carvalho Chehab , Linux Media Mailing List Subject: [PATCH 2/5] v4l: Use video_ioctl2_unlocked from drivers that don't want the bkl Date: Thu, 29 Apr 2010 05:42:41 +0200 Message-Id: <1272512564-14683-3-git-send-regression-fweisbec@gmail.com> X-Mailer: git-send-regression X-Mailer-version: 0.1, "The maintainer couldn't reproduce after one week full time debugging" special version. In-Reply-To: References: Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 29 Apr 2010 03:44:37 +0000 (UTC) diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c index aa1411f..61a3514 100644 --- a/drivers/media/video/davinci/vpfe_capture.c +++ b/drivers/media/video/davinci/vpfe_capture.c @@ -786,7 +786,7 @@ static const struct v4l2_file_operations vpfe_fops = { .owner = THIS_MODULE, .open = vpfe_open, .release = vpfe_release, - .unlocked_ioctl = video_ioctl2, + .unlocked_ioctl = video_ioctl2_unlocked, .mmap = vpfe_mmap, .poll = vpfe_poll }; diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index 68a8431..a424c1d 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c @@ -2184,7 +2184,7 @@ static struct v4l2_file_operations dev_fops = { .release = dev_close, .read = dev_read, .mmap = dev_mmap, - .unlocked_ioctl = video_ioctl2, + .unlocked_ioctl = video_ioctl2_unlocked, .poll = dev_poll, }; diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c index 196f82d..01b8a34 100644 --- a/drivers/media/video/hdpvr/hdpvr-video.c +++ b/drivers/media/video/hdpvr/hdpvr-video.c @@ -559,7 +559,7 @@ static const struct v4l2_file_operations hdpvr_fops = { .release = hdpvr_release, .read = hdpvr_read, .poll = hdpvr_poll, - .unlocked_ioctl = video_ioctl2, + .unlocked_ioctl = video_ioctl2_unlocked, }; /*=======================================================================*/