From 509775d5783fef84bfe3d207feeb705259661727 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 5 May 2010 03:01:30 -0300 Subject: [PATCH] --- yaml --- r: 193157 b: refs/heads/master c: aab9796f5580a988c46c130a727cdc398a05317b h: refs/heads/master i: 193155: be7f14eecef7b3b6578e568414f375d6bd45e800 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s2255drv.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 397c345565d7..9788037672d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9245d80c375b93db79475ca231276e1fa5a7649 +refs/heads/master: aab9796f5580a988c46c130a727cdc398a05317b diff --git a/trunk/drivers/media/video/s2255drv.c b/trunk/drivers/media/video/s2255drv.c index ac9c40cf5835..1f9a49e054a8 100644 --- a/trunk/drivers/media/video/s2255drv.c +++ b/trunk/drivers/media/video/s2255drv.c @@ -1716,11 +1716,15 @@ static int s2255_open(struct file *file) dprintk(1, "s2255: open called (dev=%s)\n", video_device_node_name(vdev)); - for (i = 0; i < MAX_CHANNELS; i++) + for (i = 0; i < MAX_CHANNELS; i++) { if (&dev->vdev[i] == vdev) { cur_channel = i; break; } + } + if (i == MAX_CHANNELS) + return -ENODEV; + /* * open lock necessary to prevent multiple instances * of v4l-conf (or other programs) from simultaneously