From: Arnd Bergmann Date: Tue, 25 Jan 2011 22:17:19 +0000 (+0100) Subject: staging/go7007: remove the BKL X-Git-Tag: upstream/snapshot3+hdmi~11216^2~787 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8aea5882c54feb246ef20399cc55ae4672697ac0;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git staging/go7007: remove the BKL There is nothing that the BKL can possibly protect here, so just remove it. Cc: Ross Cohen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/go7007/Kconfig b/drivers/staging/go7007/Kconfig index 1da57df..7dfb281 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 7547a8f..4e13251 100644 --- a/drivers/staging/go7007/s2250-loader.c +++ b/drivers/staging/go7007/s2250-loader.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include @@ -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[] = {