From 7dfb2e859507fd2b040427166b37b27e8dc5246b Mon Sep 17 00:00:00 2001 From: Christoph Pfister Date: Wed, 9 Apr 2008 17:34:09 -0300 Subject: [PATCH] --- yaml --- r: 92621 b: refs/heads/master c: 8727073beff795ec0c9cb18833431d0b606f8264 h: refs/heads/master i: 92619: 05c394067e5819e1451486d8bae2ac6781d12a49 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/ttpci/budget-av.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1330f2e966f1..8ec9c83b9609 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5a50e498603f5fa78e0373c389e2d2c3c13d709 +refs/heads/master: 8727073beff795ec0c9cb18833431d0b606f8264 diff --git a/trunk/drivers/media/dvb/ttpci/budget-av.c b/trunk/drivers/media/dvb/ttpci/budget-av.c index 2d64d557b977..f0689e064f06 100644 --- a/trunk/drivers/media/dvb/ttpci/budget-av.c +++ b/trunk/drivers/media/dvb/ttpci/budget-av.c @@ -178,7 +178,7 @@ static int ciintf_read_cam_control(struct dvb_ca_en50221 *ca, int slot, u8 addre udelay(1); result = ttpci_budget_debiread(&budget_av->budget, DEBICICAM, address & 3, 1, 0, 0); - if ((result == -ETIMEDOUT) || ((result == 0xff) && ((address & 3) < 2))) { + if (result == -ETIMEDOUT) { ciintf_slot_shutdown(ca, slot); printk(KERN_INFO "budget-av: cam ejected 3\n"); return -ETIMEDOUT;