diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-01-25 17:17:19 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-31 16:38:15 -0500 |
commit | 8aea5882c54feb246ef20399cc55ae4672697ac0 (patch) | |
tree | 215b1d687c73797e5ede3d1f7e756ecedb40e8bd | |
parent | 27a16811ab4dc819eebbd4e7b07d485f6e8f0134 (diff) |
staging/go7007: remove the BKL
There is nothing that the BKL can possibly
protect here, so just remove it.
Cc: Ross Cohen <rcohen@snurgle.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/go7007/Kconfig | 1 | ||||
-rw-r--r-- | drivers/staging/go7007/s2250-loader.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/go7007/Kconfig b/drivers/staging/go7007/Kconfig index 1da57df5cbcb..7dfb2815b9ec 100644 --- a/drivers/staging/go7007/Kconfig +++ b/drivers/staging/go7007/Kconfig | |||
@@ -1,7 +1,6 @@ | |||
1 | config VIDEO_GO7007 | 1 | config VIDEO_GO7007 |
2 | tristate "WIS GO7007 MPEG encoder support" | 2 | tristate "WIS GO7007 MPEG encoder support" |
3 | depends on VIDEO_DEV && PCI && I2C | 3 | depends on VIDEO_DEV && PCI && I2C |
4 | depends on BKL # please fix | ||
5 | depends on SND | 4 | depends on SND |
6 | select VIDEOBUF_DMA_SG | 5 | select VIDEOBUF_DMA_SG |
7 | depends on RC_CORE | 6 | depends on RC_CORE |
diff --git a/drivers/staging/go7007/s2250-loader.c b/drivers/staging/go7007/s2250-loader.c index 7547a8f77345..4e132519e253 100644 --- a/drivers/staging/go7007/s2250-loader.c +++ b/drivers/staging/go7007/s2250-loader.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
20 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
21 | #include <linux/smp_lock.h> | ||
22 | #include <linux/usb.h> | 21 | #include <linux/usb.h> |
23 | #include <dvb-usb.h> | 22 | #include <dvb-usb.h> |
24 | 23 | ||
@@ -142,11 +141,9 @@ static void s2250loader_disconnect(struct usb_interface *interface) | |||
142 | { | 141 | { |
143 | pdevice_extension_t s; | 142 | pdevice_extension_t s; |
144 | printk(KERN_INFO "s2250: disconnect\n"); | 143 | printk(KERN_INFO "s2250: disconnect\n"); |
145 | lock_kernel(); | ||
146 | s = usb_get_intfdata(interface); | 144 | s = usb_get_intfdata(interface); |
147 | usb_set_intfdata(interface, NULL); | 145 | usb_set_intfdata(interface, NULL); |
148 | kref_put(&(s->kref), s2250loader_delete); | 146 | kref_put(&(s->kref), s2250loader_delete); |
149 | unlock_kernel(); | ||
150 | } | 147 | } |
151 | 148 | ||
152 | static const struct usb_device_id s2250loader_ids[] = { | 149 | static const struct usb_device_id s2250loader_ids[] = { |