From patchwork Tue Jan 4 11:29:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Aaltonen X-Patchwork-Id: 450531 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 p04BUKnS005208 for ; Tue, 4 Jan 2011 11:30:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751002Ab1ADLaS (ORCPT ); Tue, 4 Jan 2011 06:30:18 -0500 Received: from smtp.nokia.com ([147.243.1.47]:22866 "EHLO mgw-sa01.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750803Ab1ADLaS (ORCPT ); Tue, 4 Jan 2011 06:30:18 -0500 Received: from nokia.com (localhost [127.0.0.1]) by mgw-sa01.nokia.com (Switch-3.4.3/Switch-3.4.3) with ESMTP id p04BU42D015066; Tue, 4 Jan 2011 13:30:04 +0200 Received: from localhost.localdomain ([masi.nmp.nokia.com [172.22.211.19]]) by mgw-sa01.nokia.com with RELAY id p04BTcTd014226 ; Tue, 4 Jan 2011 13:29:39 +0200 From: "Matti J. Aaltonen" To: linux-media@vger.kernel.org, mchehab@redhat.com, hverkuil@xs4all.nl Cc: "Matti J. Aaltonen" Subject: [PATCH] V4L2: WL1273 FM Radio: Replace ioctl with unlocked_ioctl. Date: Tue, 4 Jan 2011 13:29:37 +0200 Message-Id: <1294140577-15872-1-git-send-email-matti.j.aaltonen@nokia.com> X-Mailer: git-send-email 1.6.1.3 X-Nokia-AV: Clean 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, 04 Jan 2011 11:30:20 +0000 (UTC) diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c index 1813790..d6c2099 100644 --- a/drivers/media/radio/radio-wl1273.c +++ b/drivers/media/radio/radio-wl1273.c @@ -1408,7 +1408,7 @@ static const struct v4l2_file_operations wl1273_fops = { .read = wl1273_fm_fops_read, .write = wl1273_fm_fops_write, .poll = wl1273_fm_fops_poll, - .ioctl = video_ioctl2, + .unlocked_ioctl = video_ioctl2, .open = wl1273_fm_fops_open, .release = wl1273_fm_fops_release, };