From 07bd0cd39a9f1c186cc46bd302132007cb81c18d Mon Sep 17 00:00:00 2001 From: Andy Walls Date: Sat, 10 Jan 2009 18:04:45 -0300 Subject: [PATCH] --- yaml --- r: 130747 b: refs/heads/master c: 7ef5e025535ee220d7ba45dcd82f05ddce8c3e4c h: refs/heads/master i: 130745: aee8a6c21f7d9871e88a388c09ea5c433bf8ab4a 130743: abac88652ffcfb1d1af5ffebf2dab66b0dbe35e1 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7134/saa7134-core.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index baeab2faacb2..861e01b67901 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd8f894eacf13996d920fdd2aef1afc55156b191 +refs/heads/master: 7ef5e025535ee220d7ba45dcd82f05ddce8c3e4c diff --git a/trunk/drivers/media/video/saa7134/saa7134-core.c b/trunk/drivers/media/video/saa7134/saa7134-core.c index dfbe08a9ad9b..99221d726edb 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-core.c +++ b/trunk/drivers/media/video/saa7134/saa7134-core.c @@ -660,6 +660,10 @@ static int saa7134_hwinit1(struct saa7134_dev *dev) saa_writel(SAA7134_IRQ1, 0); saa_writel(SAA7134_IRQ2, 0); + + /* Clear any stale IRQ reports */ + saa_writel(SAA7134_IRQ_REPORT, saa_readl(SAA7134_IRQ_REPORT)); + mutex_init(&dev->lock); spin_lock_init(&dev->slock);