From 7613ae4ef517082073232dfb875e1f6ace9c68ef Mon Sep 17 00:00:00 2001 From: Jonathan Corbet Date: Fri, 16 May 2008 14:21:30 -0600 Subject: [PATCH] --- yaml --- r: 100317 b: refs/heads/master c: b2f2ba01b2a4356e92231669f7e3dcee37ac2fca h: refs/heads/master i: 100315: d8a30597475e285a969d181c85a359470104042f v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/printer.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3bd55d39e5c0..809281c0cb5e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26ce4f0684ef4b96d0244ac58b89ec282d5b980c +refs/heads/master: b2f2ba01b2a4356e92231669f7e3dcee37ac2fca diff --git a/trunk/drivers/usb/gadget/printer.c b/trunk/drivers/usb/gadget/printer.c index 76be75e3ab8f..ec8f2eb041ca 100644 --- a/trunk/drivers/usb/gadget/printer.c +++ b/trunk/drivers/usb/gadget/printer.c @@ -462,6 +462,7 @@ printer_open(struct inode *inode, struct file *fd) unsigned long flags; int ret = -EBUSY; + lock_kernel(); dev = container_of(inode->i_cdev, struct printer_dev, printer_cdev); spin_lock_irqsave(&dev->lock, flags); @@ -477,7 +478,7 @@ printer_open(struct inode *inode, struct file *fd) spin_unlock_irqrestore(&dev->lock, flags); DBG(dev, "printer_open returned %x\n", ret); - + unlock_kernel(); return ret; }