---

yaml --- r: 285276 b: refs/heads/master c: df25342 h: refs/heads/master v: v3
git-mirror · Nov 24, 2011 · cc6dfca · cc6dfca
1 parent 1f5b0e5
commit cc6dfca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a59fab41b9935b2e52118b331e71078aec97676
+refs/heads/master: df253423d41d377b353964b8a3343df4507fda7c
diff --git a/trunk/drivers/media/video/cx25821/cx25821-video-upstream-ch2.c b/trunk/drivers/media/video/cx25821/cx25821-video-upstream-ch2.c
@@ -610,11 +610,9 @@ static irqreturn_t cx25821_upstream_irq_ch2(int irq, void *dev_id)
 	vid_status = cx_read(sram_ch->int_stat);
 
 	/* Only deal with our interrupt */
-	if (vid_status) {
-		handled =
-		    cx25821_video_upstream_irq_ch2(dev, channel_num,
-						   vid_status);
-	}
+	if (vid_status)
+		handled = cx25821_video_upstream_irq_ch2(dev, channel_num,
+				vid_status);
 
 	if (handled < 0)
 		cx25821_stop_upstream_video_ch2(dev);