From 002d345843b1f62a61101c652df12b13fc341bf6 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 24 Jul 2012 12:00:24 -0300 Subject: [PATCH] --- yaml --- r: 320676 b: refs/heads/master c: c79a3c352469ea0a9cb2ed9e32c1932a7ff66c5c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx25821/cx25821-medusa-video.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index acdb3a7d6982..e9a4ebd0eb39 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 908d4d141f9608d1966ea8b483ee1c1aad04e438 +refs/heads/master: c79a3c352469ea0a9cb2ed9e32c1932a7ff66c5c diff --git a/trunk/drivers/media/video/cx25821/cx25821-medusa-video.c b/trunk/drivers/media/video/cx25821/cx25821-medusa-video.c index 313fb20a0b47..6a92e5c70c2a 100644 --- a/trunk/drivers/media/video/cx25821/cx25821-medusa-video.c +++ b/trunk/drivers/media/video/cx25821/cx25821-medusa-video.c @@ -499,7 +499,7 @@ static void medusa_set_decoderduration(struct cx25821_dev *dev, int decoder, mutex_lock(&dev->lock); /* no support */ - if (decoder < VDEC_A && decoder > VDEC_H) { + if (decoder < VDEC_A || decoder > VDEC_H) { mutex_unlock(&dev->lock); return; }