diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 12:57:02 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 12:57:02 -0500 |
| commit | 4b7bd364700d9ac8372eff48832062b936d0793b (patch) | |
| tree | 0dbf78c95456a0b02d07fcd473281f04a87e266d /drivers/media/video/cx231xx/cx231xx-417.c | |
| parent | c0d8768af260e2cbb4bf659ae6094a262c86b085 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge branch 'master' into for-next
Conflicts:
MAINTAINERS
arch/arm/mach-omap2/pm24xx.c
drivers/scsi/bfa/bfa_fcpim.c
Needed to update to apply fixes for which the old branch was too
outdated.
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx-417.c')
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx-417.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-417.c b/drivers/media/video/cx231xx/cx231xx-417.c index aab21f3ce472..4c7cac3b6254 100644 --- a/drivers/media/video/cx231xx/cx231xx-417.c +++ b/drivers/media/video/cx231xx/cx231xx-417.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 32 | #include <linux/device.h> | 32 | #include <linux/device.h> |
| 33 | #include <linux/firmware.h> | 33 | #include <linux/firmware.h> |
| 34 | #include <linux/smp_lock.h> | ||
| 35 | #include <linux/vmalloc.h> | 34 | #include <linux/vmalloc.h> |
| 36 | #include <media/v4l2-common.h> | 35 | #include <media/v4l2-common.h> |
| 37 | #include <media/v4l2-ioctl.h> | 36 | #include <media/v4l2-ioctl.h> |
| @@ -1927,10 +1926,9 @@ static int mpeg_open(struct file *file) | |||
| 1927 | dev = h; | 1926 | dev = h; |
| 1928 | } | 1927 | } |
| 1929 | 1928 | ||
| 1930 | if (dev == NULL) { | 1929 | if (dev == NULL) |
| 1931 | unlock_kernel(); | ||
| 1932 | return -ENODEV; | 1930 | return -ENODEV; |
| 1933 | } | 1931 | |
| 1934 | mutex_lock(&dev->lock); | 1932 | mutex_lock(&dev->lock); |
| 1935 | 1933 | ||
| 1936 | /* allocate + initialize per filehandle data */ | 1934 | /* allocate + initialize per filehandle data */ |