diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-20 11:30:00 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-20 11:31:51 -0300 |
| commit | 9554d57ebbc78db6d66057bfc12552247a7567da (patch) | |
| tree | 2411d1ea00be7836bc4260d3f3ea8c2a482e8e5b /drivers/staging/media/go7007/go7007-v4l2.c | |
| parent | 973848978be863607282391868efd77ace64278d (diff) | |
| download | op-kernel-dev-9554d57ebbc78db6d66057bfc12552247a7567da.zip op-kernel-dev-9554d57ebbc78db6d66057bfc12552247a7567da.tar.gz | |
Revert "[media] staging: media: go7007: Adlink MPG24 board issues"
This patch were applied by mistake, as it were rejected by Don, who
requested it to be broken into per-change patches.
This reverts commit 0982db20aba5fd124bb5942d679d8732478e992a.
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Volokh Konstantin <volokh84@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/media/go7007/go7007-v4l2.c')
| -rw-r--r-- | drivers/staging/media/go7007/go7007-v4l2.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/media/go7007/go7007-v4l2.c b/drivers/staging/media/go7007/go7007-v4l2.c index b8f2eb6..c184ad3 100644 --- a/drivers/staging/media/go7007/go7007-v4l2.c +++ b/drivers/staging/media/go7007/go7007-v4l2.c @@ -98,7 +98,7 @@ static int go7007_open(struct file *file) if (go->status != STATUS_ONLINE) return -EBUSY; - gofh = kzalloc(sizeof(struct go7007_file), GFP_KERNEL); + gofh = kmalloc(sizeof(struct go7007_file), GFP_KERNEL); if (gofh == NULL) return -ENOMEM; ++go->ref_count; @@ -953,7 +953,6 @@ static int vidioc_streamon(struct file *file, void *priv, } mutex_unlock(&go->hw_lock); mutex_unlock(&gofh->lock); - call_all(&go->v4l2_dev, video, s_stream, 1); return retval; } @@ -969,7 +968,6 @@ static int vidioc_streamoff(struct file *file, void *priv, mutex_lock(&gofh->lock); go7007_streamoff(go); mutex_unlock(&gofh->lock); - call_all(&go->v4l2_dev, video, s_stream, 0); return 0; } @@ -1834,6 +1832,5 @@ void go7007_v4l2_remove(struct go7007 *go) mutex_unlock(&go->hw_lock); if (go->video_dev) video_unregister_device(go->video_dev); - if (go->status != STATUS_SHUTDOWN) - v4l2_device_unregister(&go->v4l2_dev); + v4l2_device_unregister(&go->v4l2_dev); } |
