Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9aaf20cb authored by Jonathan Corbet's avatar Jonathan Corbet
Browse files

videopix: BKL pushdown



Add explicit lock_kernel() calls to vfc_open().

Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
parent 5e9829ad
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@
#include <linux/spinlock.h>
#include <linux/mutex.h>
#include <linux/mm.h>
#include <linux/smp_lock.h>

#include <asm/openprom.h>
#include <asm/oplib.h>
@@ -178,14 +179,17 @@ static int vfc_open(struct inode *inode, struct file *file)
{
	struct vfc_dev *dev;

	lock_kernel();
	spin_lock(&vfc_dev_lock);
	dev = vfc_get_dev_ptr(iminor(inode));
	if (dev == NULL) {
		spin_unlock(&vfc_dev_lock);
		unlock_kernel();
		return -ENODEV;
	}
	if (dev->busy) {
		spin_unlock(&vfc_dev_lock);
		unlock_kernel();
		return -EBUSY;
	}

@@ -202,6 +206,7 @@ static int vfc_open(struct inode *inode, struct file *file)
	vfc_captstat_reset(dev);
	
	vfc_unlock_device(dev);
	unlock_kernel();
	return 0;
}