summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Endriss <o.endriss@gmx.de>2008-04-09 19:34:09 +0200
committerOliver Endriss <o.endriss@gmx.de>2008-04-09 19:34:09 +0200
commit2d012faa604054804e822aeeca59aada41ac6c04 (patch)
treea675cd61763e6e5ff210a7d1135c9040bf9fb6f4
parente484ab203ee774632419faa227fcfc21c638edc9 (diff)
downloadmediapointer-dvb-s2-2d012faa604054804e822aeeca59aada41ac6c04.tar.gz
mediapointer-dvb-s2-2d012faa604054804e822aeeca59aada41ac6c04.tar.bz2
budget-av: Fix support for certain cams
From: Christoph Pfister <pfister@linuxtv.org> The current ci implementation doesn't accept 0xff when reading data bytes (address == 0), thus breaks cams which report a buffer size of 0x--ff like my orion one. Remove the 0xff check altogether, because validation is really the job of a higher layer. Signed-off-by: Christoph Pfister <pfister@linuxtv.org> Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
-rw-r--r--linux/drivers/media/dvb/ttpci/budget-av.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/ttpci/budget-av.c b/linux/drivers/media/dvb/ttpci/budget-av.c
index 2d64d557b..f0689e064 100644
--- a/linux/drivers/media/dvb/ttpci/budget-av.c
+++ b/linux/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;