From 2a98746b63957e05dbf831f2155510ab0e31fff1 Mon Sep 17 00:00:00 2001 From: Aidan Thornton Date: Sun, 13 Apr 2008 15:02:24 -0300 Subject: [PATCH] --- yaml --- r: 92643 b: refs/heads/master c: 0ea13e6e59853cab9e8ed3ac231ec5d44d8386a6 h: refs/heads/master i: 92641: 35f623b0a784b839f7aa49a14997fb87dbabb3a3 92639: f87ba2dacd86d29553dc177cc5b727c4cda3b3a1 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-video.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index cf7d125f37db..71e587c66ef8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b957dfdc3161d00b01b52154eb2d53580c8911e5 +refs/heads/master: 0ea13e6e59853cab9e8ed3ac231ec5d44d8386a6 diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c index d6ada6226b54..d3485f500c5e 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-video.c +++ b/trunk/drivers/media/video/em28xx/em28xx-video.c @@ -947,6 +947,12 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv, goto out; } + if (dev->stream_on && !fh->stream_on) { + em28xx_errdev("%s device in use by another fh\n", __func__); + rc = -EBUSY; + goto out; + } + /* set new image size */ dev->width = f->fmt.pix.width; dev->height = f->fmt.pix.height;