diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-19 17:04:25 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-19 17:04:25 +0900 |
| commit | fe040be2fdc49a4132c5f64359c629aeeb8e4947 (patch) | |
| tree | 40323a8f05d3754372f561bb8f4698ef1a4e9c8f /drivers/media/video/se401.c | |
| parent | 2006920a18cc9f499e5cccf9e6f1aa9f6120705e (diff) | |
| parent | 6722a4016d7f5f107a82ad71a3ee1ccec105532f (diff) | |
| download | kernel_samsung_smdk4412-fe040be2fdc49a4132c5f64359c629aeeb8e4947.zip kernel_samsung_smdk4412-fe040be2fdc49a4132c5f64359c629aeeb8e4947.tar.gz kernel_samsung_smdk4412-fe040be2fdc49a4132c5f64359c629aeeb8e4947.tar.bz2 | |
Merge branch 'common/fbdev-mipi' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
Diffstat (limited to 'drivers/media/video/se401.c')
| -rw-r--r-- | drivers/media/video/se401.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c index 41d0166..41360d7 100644 --- a/drivers/media/video/se401.c +++ b/drivers/media/video/se401.c @@ -31,7 +31,6 @@ static const char version[] = "0.24"; #include <linux/init.h> #include <linux/vmalloc.h> #include <linux/slab.h> -#include <linux/smp_lock.h> #include <linux/pagemap.h> #include <linux/usb.h> #include "se401.h" @@ -951,9 +950,9 @@ static int se401_open(struct file *file) struct usb_se401 *se401 = (struct usb_se401 *)dev; int err = 0; - lock_kernel(); + mutex_lock(&se401->lock); if (se401->user) { - unlock_kernel(); + mutex_unlock(&se401->lock); return -EBUSY; } se401->fbuf = rvmalloc(se401->maxframesize * SE401_NUMFRAMES); @@ -962,7 +961,7 @@ static int se401_open(struct file *file) else err = -ENOMEM; se401->user = !err; - unlock_kernel(); + mutex_unlock(&se401->lock); return err; } |