From b5280ca1ffe7e7f5792b1dc9837d743e47bdea7b Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 26 Mar 2009 17:47:48 -0300 Subject: [PATCH] --- yaml --- r: 138342 b: refs/heads/master c: 0b61dca28909bc548581bec75e3b90faaa7f11fd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/pluto2/pluto2.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d947fd3af6b1..173825d4a9ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fbc0ae205c5dfb1049a36f0a98cc9211a3a090bb +refs/heads/master: 0b61dca28909bc548581bec75e3b90faaa7f11fd diff --git a/trunk/drivers/media/dvb/pluto2/pluto2.c b/trunk/drivers/media/dvb/pluto2/pluto2.c index d101b304e9b0..ee89623be85a 100644 --- a/trunk/drivers/media/dvb/pluto2/pluto2.c +++ b/trunk/drivers/media/dvb/pluto2/pluto2.c @@ -116,6 +116,7 @@ struct pluto { /* irq */ unsigned int overflow; + unsigned int dead; /* dma */ dma_addr_t dma_addr; @@ -336,8 +337,10 @@ static irqreturn_t pluto_irq(int irq, void *dev_id) return IRQ_NONE; if (tscr == 0xffffffff) { - // FIXME: maybe recover somehow - dev_err(&pluto->pdev->dev, "card hung up :(\n"); + if (pluto->dead == 0) + dev_err(&pluto->pdev->dev, "card has hung or been ejected.\n"); + /* It's dead Jim */ + pluto->dead = 1; return IRQ_HANDLED; }