diff options
author | Stoyan Gaydarov <stoyboyker@gmail.com> | 2009-04-14 19:46:19 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-04-14 19:46:19 -0700 |
commit | 6c0f8bc77233d000a34a01989c42e650c8c32180 (patch) | |
tree | 9262d2e1467e09030ef9e8fe860c718aa7a64e1f /drivers/sbus/char/uctrl.c | |
parent | c7cb1521b3289e2d107d3139ad7a902b386d7e43 (diff) | |
download | blackbird-op-linux-6c0f8bc77233d000a34a01989c42e650c8c32180.tar.gz blackbird-op-linux-6c0f8bc77233d000a34a01989c42e650c8c32180.zip |
sbus: changed ioctls to unlocked
Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/sbus/char/uctrl.c')
-rw-r--r-- | drivers/sbus/char/uctrl.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c index 27993c37775d..2c56fd56ec63 100644 --- a/drivers/sbus/char/uctrl.c +++ b/drivers/sbus/char/uctrl.c @@ -197,9 +197,8 @@ static struct uctrl_driver { static void uctrl_get_event_status(struct uctrl_driver *); static void uctrl_get_external_status(struct uctrl_driver *); -static int -uctrl_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg) +static long +uctrl_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { switch (cmd) { default: @@ -226,7 +225,7 @@ static irqreturn_t uctrl_interrupt(int irq, void *dev_id) static const struct file_operations uctrl_fops = { .owner = THIS_MODULE, .llseek = no_llseek, - .ioctl = uctrl_ioctl, + .unlocked_ioctl = uctrl_ioctl, .open = uctrl_open, }; |