diff options
Diffstat (limited to 'drivers/media/video/zoran_driver.c')
-rw-r--r-- | drivers/media/video/zoran_driver.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c index 2dab9eea4def..4aa1a765626d 100644 --- a/drivers/media/video/zoran_driver.c +++ b/drivers/media/video/zoran_driver.c | |||
@@ -1211,6 +1211,7 @@ zoran_open (struct inode *inode, | |||
1211 | struct zoran_fh *fh; | 1211 | struct zoran_fh *fh; |
1212 | int i, res, first_open = 0, have_module_locks = 0; | 1212 | int i, res, first_open = 0, have_module_locks = 0; |
1213 | 1213 | ||
1214 | lock_kernel(); | ||
1214 | /* find the device */ | 1215 | /* find the device */ |
1215 | for (i = 0; i < zoran_num; i++) { | 1216 | for (i = 0; i < zoran_num; i++) { |
1216 | if (zoran[i]->video_dev->minor == minor) { | 1217 | if (zoran[i]->video_dev->minor == minor) { |
@@ -1321,6 +1322,7 @@ zoran_open (struct inode *inode, | |||
1321 | file->private_data = fh; | 1322 | file->private_data = fh; |
1322 | fh->zr = zr; | 1323 | fh->zr = zr; |
1323 | zoran_open_init_session(file); | 1324 | zoran_open_init_session(file); |
1325 | unlock_kernel(); | ||
1324 | 1326 | ||
1325 | return 0; | 1327 | return 0; |
1326 | 1328 | ||
@@ -1338,6 +1340,7 @@ open_unlock_and_return: | |||
1338 | if (zr) { | 1340 | if (zr) { |
1339 | /*mutex_unlock(&zr->resource_lock);*/ | 1341 | /*mutex_unlock(&zr->resource_lock);*/ |
1340 | } | 1342 | } |
1343 | unlock_kernel(); | ||
1341 | 1344 | ||
1342 | return res; | 1345 | return res; |
1343 | } | 1346 | } |