diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-04 09:28:25 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-04 09:28:25 -0300 |
| commit | e465ad8685774c7c9a2cf71e9d196b7aaa8cae35 (patch) | |
| tree | b1f83dd9bf6f9447f4f1491b6974315b5bc99ee9 /linux/drivers/media/video/zoran_driver.c | |
| parent | 4be14b5602f1f21b6e2a436f240a12797888ae48 (diff) | |
| parent | c8b5c505811fd4797e0ea35bcc60478d626a0971 (diff) | |
| download | mediapointer-dvb-s2-e465ad8685774c7c9a2cf71e9d196b7aaa8cae35.tar.gz mediapointer-dvb-s2-e465ad8685774c7c9a2cf71e9d196b7aaa8cae35.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-bkl
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/zoran_driver.c')
| -rw-r--r-- | linux/drivers/media/video/zoran_driver.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linux/drivers/media/video/zoran_driver.c b/linux/drivers/media/video/zoran_driver.c index 0c1c349cd..78e8430f4 100644 --- a/linux/drivers/media/video/zoran_driver.c +++ b/linux/drivers/media/video/zoran_driver.c @@ -1276,6 +1276,7 @@ zoran_open (struct inode *inode, struct zoran_fh *fh; int i, res, first_open = 0, have_module_locks = 0; + lock_kernel(); /* find the device */ for (i = 0; i < zoran_num; i++) { if (zoran[i]->video_dev->minor == minor) { @@ -1386,6 +1387,7 @@ zoran_open (struct inode *inode, file->private_data = fh; fh->zr = zr; zoran_open_init_session(file); + unlock_kernel(); return 0; @@ -1403,6 +1405,7 @@ open_unlock_and_return: if (zr) { /*mutex_unlock(&zr->resource_lock);*/ } + unlock_kernel(); return res; } |