From f9b73efb1ed844a5ba5214ca3592a2bb22deabef Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 22 Feb 2011 00:27:41 -0300 Subject: [PATCH] --- yaml --- r: 241863 b: refs/heads/master c: 78e51566f0c56daa58f7bbe2591336b7d478c148 h: refs/heads/master i: 241861: c304ac92ae8dec9534a526b52c18d8d62d4f390f 241859: e25d34e7856871814cd801b123b02a0f04eb21fd 241855: d1566f4643c216ad8355a1ddf741dd64357e4a3f v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-video.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a4b1d236256b..2e7e7ac49aa2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e09a3c92bfd54a6ac03f8225c4fd10f50111beb +refs/heads/master: 78e51566f0c56daa58f7bbe2591336b7d478c148 diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c index f34d524ccb09..1ddd3ee22812 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-video.c +++ b/trunk/drivers/media/video/em28xx/em28xx-video.c @@ -1452,7 +1452,7 @@ static int vidioc_s_ctrl(struct file *file, void *priv, rc = em28xx_audio_analog_set(dev); } } - return rc; + return (rc < 0) ? rc : 0; } static int vidioc_g_tuner(struct file *file, void *priv,