From patchwork Mon May 9 19:54:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Ringel X-Patchwork-Id: 770712 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p49JsSUJ020909 for ; Mon, 9 May 2011 19:54:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754601Ab1EITyX (ORCPT ); Mon, 9 May 2011 15:54:23 -0400 Received: from mail-in-04.arcor-online.net ([151.189.21.44]:43782 "EHLO mail-in-04.arcor-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754496Ab1EITyQ (ORCPT ); Mon, 9 May 2011 15:54:16 -0400 Received: from mail-in-09-z2.arcor-online.net (mail-in-09-z2.arcor-online.net [151.189.8.21]) by mx.arcor.de (Postfix) with ESMTP id 0AFEAA9D61; Mon, 9 May 2011 21:54:15 +0200 (CEST) Received: from mail-in-14.arcor-online.net (mail-in-14.arcor-online.net [151.189.21.54]) by mail-in-09-z2.arcor-online.net (Postfix) with ESMTP id DF63520416; Mon, 9 May 2011 21:54:14 +0200 (CEST) Received: from localhost.localdomain (dslb-178-000-053-073.pools.arcor-ip.net [178.0.53.73]) (Authenticated sender: stefan.ringel@arcor.de) by mail-in-14.arcor-online.net (Postfix) with ESMTPA id B15559C5FB; Mon, 9 May 2011 21:54:14 +0200 (CEST) X-DKIM: Sendmail DKIM Filter v2.8.2 mail-in-14.arcor-online.net B15559C5FB DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arcor.de; s=mail-in; t=1304970854; bh=XY0qeJ4QBETE5BiE5SZ5qr6vR9fhwY3goqotTbLI01E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=kG2YUbOuE00drPDWayB1/a87Q5H2OXcYRs/es5TPD0M9BEKKi0cfvkKnp3bQ2Ckp1 V6IlkaiWXTaCVZWiL41LvnFj5cPQpmGCb3ZBmtpGS7X1mdvnYYo6XNSUdbVK6lm3wY Z5My1iFIzU0o8Lr1tIMO29OU/+S5WdfmlqYw/m+s= From: stefan.ringel@arcor.de To: linux-media@vger.kernel.org Cc: mchehab@redhat.com, d.belimov@gmail.com, Stefan Ringel Subject: [PATCH 13/16] tm6000: change from ioctl to unlocked_ioctl Date: Mon, 9 May 2011 21:54:01 +0200 Message-Id: <1304970844-20955-13-git-send-email-stefan.ringel@arcor.de> X-Mailer: git-send-email 1.7.4.2 In-Reply-To: <1304970844-20955-1-git-send-email-stefan.ringel@arcor.de> References: <1304970844-20955-1-git-send-email-stefan.ringel@arcor.de> 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.6 (demeter2.kernel.org [140.211.167.43]); Mon, 09 May 2011 19:54:29 +0000 (UTC) From: Stefan Ringel change from ioctl to unlocked_ioctl Signed-off-by: Stefan Ringel --- drivers/staging/tm6000/tm6000-video.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/tm6000/tm6000-video.c b/drivers/staging/tm6000/tm6000-video.c index ea5ad6c..2d83204 100644 --- a/drivers/staging/tm6000/tm6000-video.c +++ b/drivers/staging/tm6000/tm6000-video.c @@ -1666,10 +1666,10 @@ static struct video_device tm6000_template = { }; static const struct v4l2_file_operations radio_fops = { - .owner = THIS_MODULE, - .open = tm6000_open, - .release = tm6000_release, - .ioctl = video_ioctl2, + .owner = THIS_MODULE, + .open = tm6000_open, + .release = tm6000_release, + .unlocked_ioctl = video_ioctl2, }; static const struct v4l2_ioctl_ops radio_ioctl_ops = {