From patchwork Sun Nov 21 20:32:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 346231 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oALKX6gA019514 for ; Sun, 21 Nov 2010 20:33:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755810Ab0KUUcz (ORCPT ); Sun, 21 Nov 2010 15:32:55 -0500 Received: from perceval.ideasonboard.com ([95.142.166.194]:39754 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755720Ab0KUUcy (ORCPT ); Sun, 21 Nov 2010 15:32:54 -0500 Received: from localhost.localdomain (unknown [91.178.49.10]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 5A21F35CA7 for ; Sun, 21 Nov 2010 20:32:53 +0000 (UTC) From: Laurent Pinchart To: linux-media@vger.kernel.org Subject: [PATCH 5/5] uvcvideo: Convert to unlocked_ioctl Date: Sun, 21 Nov 2010 21:32:53 +0100 Message-Id: <1290371573-14907-6-git-send-email-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 1.7.2.2 In-Reply-To: <1290371573-14907-1-git-send-email-laurent.pinchart@ideasonboard.com> References: <1290371573-14907-1-git-send-email-laurent.pinchart@ideasonboard.com> 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 (demeter1.kernel.org [140.211.167.41]); Sun, 21 Nov 2010 20:33:08 +0000 (UTC) diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c index b4615e2..3349e26 100644 --- a/drivers/media/video/uvc/uvc_v4l2.c +++ b/drivers/media/video/uvc/uvc_v4l2.c @@ -1088,7 +1088,7 @@ const struct v4l2_file_operations uvc_fops = { .owner = THIS_MODULE, .open = uvc_v4l2_open, .release = uvc_v4l2_release, - .ioctl = uvc_v4l2_ioctl, + .unlocked_ioctl = uvc_v4l2_ioctl, .read = uvc_v4l2_read, .mmap = uvc_v4l2_mmap, .poll = uvc_v4l2_poll,