diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 04:37:46 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 04:37:46 -0300 |
| commit | be91c19fe859cc841a29603d943e915f7691bc95 (patch) | |
| tree | b72344c4a1f05605d2b66cefd90c051737197376 /linux/drivers/media/dvb/pluto2 | |
| parent | 01a9b73d338c6ac427e752fbc56c85d1ab5259b9 (diff) | |
| parent | 2cc0abb17583ba0769357943dee38920a8cd757e (diff) | |
| download | mediapointer-dvb-s2-be91c19fe859cc841a29603d943e915f7691bc95.tar.gz mediapointer-dvb-s2-be91c19fe859cc841a29603d943e915f7691bc95.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tuner
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/pluto2')
| -rw-r--r-- | linux/drivers/media/dvb/pluto2/pluto2.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/pluto2/pluto2.c b/linux/drivers/media/dvb/pluto2/pluto2.c index 8522757a5..b27073216 100644 --- a/linux/drivers/media/dvb/pluto2/pluto2.c +++ b/linux/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; @@ -344,8 +345,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; } |