From patchwork Tue Nov 16 21:56:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Verkuil X-Patchwork-Id: 329881 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 oAGLv3lJ005871 for ; Tue, 16 Nov 2010 21:57:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932822Ab0KPV4w (ORCPT ); Tue, 16 Nov 2010 16:56:52 -0500 Received: from smtp-vbr18.xs4all.nl ([194.109.24.38]:4301 "EHLO smtp-vbr18.xs4all.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932723Ab0KPV4w (ORCPT ); Tue, 16 Nov 2010 16:56:52 -0500 Received: from localhost (209.80-203-30.nextgentel.com [80.203.30.209]) by smtp-vbr18.xs4all.nl (8.13.8/8.13.8) with ESMTP id oAGLuntJ039580 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Tue, 16 Nov 2010 22:56:50 +0100 (CET) (envelope-from hverkuil@xs4all.nl) Message-Id: <0819999d64a0e2c9b092c60602d32e2d7ab7ad25.1289944160.git.hverkuil@xs4all.nl> In-Reply-To: References: From: Hans Verkuil Date: Tue, 16 Nov 2010 22:56:48 +0100 Subject: [RFCv2 PATCH 15/15] cx18: convert to 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:10 +0000 (UTC) diff --git a/drivers/media/video/cx18/cx18-streams.c b/drivers/media/video/cx18/cx18-streams.c index 9045f1e..ab461e2 100644 --- a/drivers/media/video/cx18/cx18-streams.c +++ b/drivers/media/video/cx18/cx18-streams.c @@ -41,7 +41,7 @@ static struct v4l2_file_operations cx18_v4l2_enc_fops = { .read = cx18_v4l2_read, .open = cx18_v4l2_open, /* FIXME change to video_ioctl2 if serialization lock can be removed */ - .ioctl = cx18_v4l2_ioctl, + .unlocked_ioctl = cx18_v4l2_ioctl, .release = cx18_v4l2_close, .poll = cx18_v4l2_enc_poll, };