From patchwork Tue Nov 16 21:56:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Verkuil X-Patchwork-Id: 329851 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 oAGLv3lF005871 for ; Tue, 16 Nov 2010 21:57:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932787Ab0KPV4o (ORCPT ); Tue, 16 Nov 2010 16:56:44 -0500 Received: from smtp-vbr6.xs4all.nl ([194.109.24.26]:2159 "EHLO smtp-vbr6.xs4all.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932723Ab0KPV4n (ORCPT ); Tue, 16 Nov 2010 16:56:43 -0500 Received: from localhost (209.80-203-30.nextgentel.com [80.203.30.209]) by smtp-vbr6.xs4all.nl (8.13.8/8.13.8) with ESMTP id oAGLubhH020498 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Tue, 16 Nov 2010 22:56:41 +0100 (CET) (envelope-from hverkuil@xs4all.nl) Message-Id: <7435cf8010aeb894922382631c7390bdaa4bd6df.1289944160.git.hverkuil@xs4all.nl> In-Reply-To: References: From: Hans Verkuil Date: Tue, 16 Nov 2010 22:56:35 +0100 Subject: [RFCv2 PATCH 11/15] cafe_ccic: replace ioctl by unlocked_ioctl. To: linux-media@vger.kernel.org Cc: Arnd Bergmann X-Virus-Scanned: by XS4ALL Virus Scanner 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]); Tue, 16 Nov 2010 21:57:03 +0000 (UTC) diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c index d147525..f85c933 100644 --- a/drivers/media/video/cafe_ccic.c +++ b/drivers/media/video/cafe_ccic.c @@ -1773,7 +1773,7 @@ static const struct v4l2_file_operations cafe_v4l_fops = { .read = cafe_v4l_read, .poll = cafe_v4l_poll, .mmap = cafe_v4l_mmap, - .ioctl = video_ioctl2, + .unlocked_ioctl = video_ioctl2, }; static const struct v4l2_ioctl_ops cafe_v4l_ioctl_ops = {