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;
 	}