diff options
| author | Oliver Neukum <oliver@neukum.org> | 2010-01-13 09:33:15 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 17:54:23 -0500 |
| commit | 86266452f80545285c14e20a8024f79c4fb88a86 (patch) | |
| tree | ebb0a287f9bf189737d4924536d18b36492fd330 /drivers/usb/image/mdc800.c | |
| parent | f9de332ebf9df71892d52f7eb64af101a647349f (diff) | |
USB: Push BKL on open down into the drivers
Straightforward push into the drivers to allow
auditing individual drivers separately
Signed-off-by: Oliver Neukum <oliver@neukum.org>
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/image/mdc800.c')
| -rw-r--r-- | drivers/usb/image/mdc800.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/image/mdc800.c b/drivers/usb/image/mdc800.c index e192e8f7c560..dce4f7b69ac3 100644 --- a/drivers/usb/image/mdc800.c +++ b/drivers/usb/image/mdc800.c | |||
| @@ -96,6 +96,7 @@ | |||
| 96 | #include <linux/module.h> | 96 | #include <linux/module.h> |
| 97 | #include <linux/wait.h> | 97 | #include <linux/wait.h> |
| 98 | #include <linux/mutex.h> | 98 | #include <linux/mutex.h> |
| 99 | #include <linux/smp_lock.h> | ||
| 99 | 100 | ||
| 100 | #include <linux/usb.h> | 101 | #include <linux/usb.h> |
| 101 | #include <linux/fs.h> | 102 | #include <linux/fs.h> |
| @@ -622,6 +623,7 @@ static int mdc800_device_open (struct inode* inode, struct file *file) | |||
| 622 | int retval=0; | 623 | int retval=0; |
| 623 | int errn=0; | 624 | int errn=0; |
| 624 | 625 | ||
| 626 | lock_kernel(); | ||
| 625 | mutex_lock(&mdc800->io_lock); | 627 | mutex_lock(&mdc800->io_lock); |
| 626 | 628 | ||
| 627 | if (mdc800->state == NOT_CONNECTED) | 629 | if (mdc800->state == NOT_CONNECTED) |
| @@ -660,6 +662,7 @@ static int mdc800_device_open (struct inode* inode, struct file *file) | |||
| 660 | 662 | ||
| 661 | error_out: | 663 | error_out: |
| 662 | mutex_unlock(&mdc800->io_lock); | 664 | mutex_unlock(&mdc800->io_lock); |
| 665 | unlock_kernel(); | ||
| 663 | return errn; | 666 | return errn; |
| 664 | } | 667 | } |
| 665 | 668 | ||
