From cc6dfca42c238ae99aabf1ee889ddb91f1b0812b Mon Sep 17 00:00:00 2001 From: "Leonid V. Fedorenchik" Date: Sat, 22 Oct 2011 01:43:44 -0300 Subject: [PATCH] --- yaml --- r: 285276 b: refs/heads/master c: df253423d41d377b353964b8a3343df4507fda7c h: refs/heads/master v: v3 --- [refs] | 2 +- .../media/video/cx25821/cx25821-video-upstream-ch2.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 27a172641187..334096cdb33c 100644 --- 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 index 53927e86ce0a..1e452b85f544 100644 --- 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);