lkml.org 
[lkml]   [2008]   [May]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] hci_vhci: Elimiate BKL from ioctl handling
Alan Cox wrote:
> Switch to unlocked_ioctl and fix the return value to be -ENOTTY as it
> should be.
>
> Signed-off-by: Alan Cox <alan@redhat.com>
>
> diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
> index 0638730..41002ef 100644
> --- a/drivers/bluetooth/hci_vhci.c
> +++ b/drivers/bluetooth/hci_vhci.c
> @@ -245,10 +245,9 @@ static unsigned int vhci_poll(struct file *file, poll_table *wait)
> return POLLOUT | POLLWRNORM;
> }
>
> -static int vhci_ioctl(struct inode *inode, struct file *file,
> - unsigned int cmd, unsigned long arg)
> +static long vhci_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
> {
> - return -EINVAL;
> + return -ENOTTY;
> }
>
> static int vhci_open(struct inode *inode, struct file *file)
> @@ -332,7 +331,7 @@ static const struct file_operations vhci_fops = {
> .read = vhci_read,
> .write = vhci_write,
> .poll = vhci_poll,
> - .ioctl = vhci_ioctl,
> + .unlocked_ioctl = vhci_ioctl,
> .open = vhci_open,
> .release = vhci_release,
> .fasync = vhci_fasync,
>

Ack.

CC'ing Marcel.

Max


\
 
 \ /
  Last update: 2008-05-22 22:55    [W:0.059 / U:0.992 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site