diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2010-04-27 00:24:00 +0200 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-05-17 05:27:04 +0200 |
| commit | 16ef8def80ea97c3cacdcaa765bdf62b2d94f86d (patch) | |
| tree | 23d3a44a979fd86636b7f6aa66e09f8e0dbaa019 /drivers/media/dvb/firewire/firedtv-ci.c | |
| parent | ce8273a573918612cbd320597db3d5dd89578454 (diff) | |
dvb: Push down BKL into ioctl functions
This requires changing all users of dvb_usercopy to
omit the inode argument.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'drivers/media/dvb/firewire/firedtv-ci.c')
| -rw-r--r-- | drivers/media/dvb/firewire/firedtv-ci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/dvb/firewire/firedtv-ci.c b/drivers/media/dvb/firewire/firedtv-ci.c index 853e04b7cb3..d3c2cf60de7 100644 --- a/drivers/media/dvb/firewire/firedtv-ci.c +++ b/drivers/media/dvb/firewire/firedtv-ci.c @@ -175,8 +175,7 @@ static int fdtv_ca_send_msg(struct firedtv *fdtv, void *arg) return err; } -static int fdtv_ca_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, void *arg) +static int fdtv_ca_ioctl(struct file *file, unsigned int cmd, void *arg) { struct dvb_device *dvbdev = file->private_data; struct firedtv *fdtv = dvbdev->priv; @@ -217,7 +216,7 @@ static unsigned int fdtv_ca_io_poll(struct file *file, poll_table *wait) static const struct file_operations fdtv_ca_fops = { .owner = THIS_MODULE, - .ioctl = dvb_generic_ioctl, + .unlocked_ioctl = dvb_generic_ioctl, .open = dvb_generic_open, .release = dvb_generic_release, .poll = fdtv_ca_io_poll, |