diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2009-03-26 16:47:48 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:43 -0400 |
| commit | 0b61dca28909bc548581bec75e3b90faaa7f11fd (patch) | |
| tree | 3373e8b0792cfa62f57408bd5e3e4be8c43df787 | |
| parent | fbc0ae205c5dfb1049a36f0a98cc9211a3a090bb (diff) | |
V4L/DVB (11244): pluto2: silence spew of card hung up messages
If the card is ejected on some systems you get a spew of messages as other
shared IRQ devices interrupt between the card eject and the card IRQ
disable.
We don't need to spew them all out
Closes #7472
Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/dvb/pluto2/pluto2.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c index d101b304e9b..ee89623be85 100644 --- a/drivers/media/dvb/pluto2/pluto2.c +++ b/drivers/media/dvb/pluto2/pluto2.c | |||
| @@ -116,6 +116,7 @@ struct pluto { | |||
| 116 | 116 | ||
| 117 | /* irq */ | 117 | /* irq */ |
| 118 | unsigned int overflow; | 118 | unsigned int overflow; |
| 119 | unsigned int dead; | ||
| 119 | 120 | ||
| 120 | /* dma */ | 121 | /* dma */ |
| 121 | dma_addr_t dma_addr; | 122 | dma_addr_t dma_addr; |
| @@ -336,8 +337,10 @@ static irqreturn_t pluto_irq(int irq, void *dev_id) | |||
| 336 | return IRQ_NONE; | 337 | return IRQ_NONE; |
| 337 | 338 | ||
| 338 | if (tscr == 0xffffffff) { | 339 | if (tscr == 0xffffffff) { |
| 339 | // FIXME: maybe recover somehow | 340 | if (pluto->dead == 0) |
| 340 | dev_err(&pluto->pdev->dev, "card hung up :(\n"); | 341 | dev_err(&pluto->pdev->dev, "card has hung or been ejected.\n"); |
| 342 | /* It's dead Jim */ | ||
| 343 | pluto->dead = 1; | ||
| 341 | return IRQ_HANDLED; | 344 | return IRQ_HANDLED; |
| 342 | } | 345 | } |
| 343 | 346 | ||
