diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-01-25 23:17:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-31 13:38:15 -0800 |
| commit | 8aea5882c54feb246ef20399cc55ae4672697ac0 (patch) | |
| tree | 215b1d687c73797e5ede3d1f7e756ecedb40e8bd | |
| parent | 27a16811ab4dc819eebbd4e7b07d485f6e8f0134 (diff) | |
| download | talos-obmc-linux-8aea5882c54feb246ef20399cc55ae4672697ac0.tar.gz talos-obmc-linux-8aea5882c54feb246ef20399cc55ae4672697ac0.zip | |
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 @@ config VIDEO_GO7007 tristate "WIS GO7007 MPEG encoder support" depends on VIDEO_DEV && PCI && I2C - depends on BKL # please fix depends on SND select VIDEOBUF_DMA_SG 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 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/usb.h> #include <dvb-usb.h> @@ -142,11 +141,9 @@ static void s2250loader_disconnect(struct usb_interface *interface) { pdevice_extension_t s; printk(KERN_INFO "s2250: disconnect\n"); - lock_kernel(); s = usb_get_intfdata(interface); usb_set_intfdata(interface, NULL); kref_put(&(s->kref), s2250loader_delete); - unlock_kernel(); } static const struct usb_device_id s2250loader_ids[] = { |
