diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-05-22 22:03:27 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 15:16:18 -0700 |
| commit | 44c389a00ff7229ab2f2aab22ce03ae0c9037df7 (patch) | |
| tree | 24f9d98e40cf838efadbb4683135018e2a9038d8 /drivers/usb/gadget/printer.c | |
| parent | 0391c828ce75cc71ae301946699a6f2d515fd99d (diff) | |
| download | talos-op-linux-44c389a00ff7229ab2f2aab22ce03ae0c9037df7.tar.gz talos-op-linux-44c389a00ff7229ab2f2aab22ce03ae0c9037df7.zip | |
USB: gadget: Push BKL down into drivers
This keeps the gadget ioctl method wrapped but pushes the BKL down into
the gadget code so we can use unlocked_ioctl().
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget/printer.c')
| -rw-r--r-- | drivers/usb/gadget/printer.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c index ec8f2eb041ca..9caaec3ae9a3 100644 --- a/drivers/usb/gadget/printer.c +++ b/drivers/usb/gadget/printer.c @@ -828,9 +828,8 @@ printer_poll(struct file *fd, poll_table *wait) return status; } -static int -printer_ioctl(struct inode *inode, struct file *fd, unsigned int code, - unsigned long arg) +static long +printer_ioctl(struct file *fd, unsigned int code, unsigned long arg) { struct printer_dev *dev = fd->private_data; unsigned long flags; @@ -869,7 +868,7 @@ static struct file_operations printer_io_operations = { .write = printer_write, .fsync = printer_fsync, .poll = printer_poll, - .ioctl = printer_ioctl, + .unlocked_ioctl = printer_ioctl, .release = printer_close }; |
