From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 May 2008 17:16:12 +0000 (+0200)
Subject: media-radio-miropcm20-rds: BKL pushdown
X-Git-Tag: v2.6.27-rc1~1103^2~50
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cad84238056babf4e4e6b0de183238224aab8177;p=linux-2.6-omap-h63xx.git

media-radio-miropcm20-rds: BKL pushdown

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

diff --git a/drivers/media/radio/miropcm20-rds.c b/drivers/media/radio/miropcm20-rds.c
index 06dfed9ef4c..3e840f74d45 100644
--- a/drivers/media/radio/miropcm20-rds.c
+++ b/drivers/media/radio/miropcm20-rds.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/delay.h>
@@ -27,13 +28,16 @@ static int rds_f_open(struct inode *in, struct file *fi)
 	if (rds_users)
 		return -EBUSY;
 
+	lock_kernel();
 	rds_users++;
 	if ((text_buffer=kmalloc(66, GFP_KERNEL)) == 0) {
 		rds_users--;
 		printk(KERN_NOTICE "aci-rds: Out of memory by open()...\n");
+		unlock_kernel();
 		return -ENOMEM;
 	}
 
+	unlock_kernel();
 	return 0;
 }