|
@@ -24,6 +24,7 @@
|
|
#include <linux/spinlock.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/mm.h>
|
|
|
|
+#include <linux/smp_lock.h>
|
|
|
|
|
|
#include <asm/openprom.h>
|
|
#include <asm/openprom.h>
|
|
#include <asm/oplib.h>
|
|
#include <asm/oplib.h>
|
|
@@ -178,14 +179,17 @@ static int vfc_open(struct inode *inode, struct file *file)
|
|
{
|
|
{
|
|
struct vfc_dev *dev;
|
|
struct vfc_dev *dev;
|
|
|
|
|
|
|
|
+ lock_kernel();
|
|
spin_lock(&vfc_dev_lock);
|
|
spin_lock(&vfc_dev_lock);
|
|
dev = vfc_get_dev_ptr(iminor(inode));
|
|
dev = vfc_get_dev_ptr(iminor(inode));
|
|
if (dev == NULL) {
|
|
if (dev == NULL) {
|
|
spin_unlock(&vfc_dev_lock);
|
|
spin_unlock(&vfc_dev_lock);
|
|
|
|
+ unlock_kernel();
|
|
return -ENODEV;
|
|
return -ENODEV;
|
|
}
|
|
}
|
|
if (dev->busy) {
|
|
if (dev->busy) {
|
|
spin_unlock(&vfc_dev_lock);
|
|
spin_unlock(&vfc_dev_lock);
|
|
|
|
+ unlock_kernel();
|
|
return -EBUSY;
|
|
return -EBUSY;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -202,6 +206,7 @@ static int vfc_open(struct inode *inode, struct file *file)
|
|
vfc_captstat_reset(dev);
|
|
vfc_captstat_reset(dev);
|
|
|
|
|
|
vfc_unlock_device(dev);
|
|
vfc_unlock_device(dev);
|
|
|
|
+ unlock_kernel();
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|