diff options
author | Andrew de Quincey <adq_dvb@lidskialf.net> | 2005-09-09 16:03:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 16:57:45 -0400 |
commit | b548747d78f8840024ac3439b7149348a282e086 (patch) | |
tree | d05cac12c5390d993e7c8f377120ef1697cae87f /drivers/media/dvb | |
parent | dc27a1696089a9a9d317fc815915e6761e22eeb5 (diff) |
[PATCH] dvb: budget-av: fixes for CI interface
Fixes for CI interface.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/ttpci/budget-av.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c index 311be50b2fce..8c2a29007db5 100644 --- a/drivers/media/dvb/ttpci/budget-av.c +++ b/drivers/media/dvb/ttpci/budget-av.c | |||
@@ -192,7 +192,7 @@ static int ciintf_slot_reset(struct dvb_ca_en50221 *ca, int slot) | |||
192 | { | 192 | { |
193 | struct budget_av *budget_av = (struct budget_av *) ca->data; | 193 | struct budget_av *budget_av = (struct budget_av *) ca->data; |
194 | struct saa7146_dev *saa = budget_av->budget.dev; | 194 | struct saa7146_dev *saa = budget_av->budget.dev; |
195 | int timeout = 50; // 5 seconds (4.4.6 Ready) | 195 | int timeout = 500; // 5 seconds (4.4.6 Ready) |
196 | 196 | ||
197 | if (slot != 0) | 197 | if (slot != 0) |
198 | return -EINVAL; | 198 | return -EINVAL; |
@@ -217,7 +217,6 @@ static int ciintf_slot_reset(struct dvb_ca_en50221 *ca, int slot) | |||
217 | { | 217 | { |
218 | printk(KERN_ERR "budget-av: cam reset failed (timeout).\n"); | 218 | printk(KERN_ERR "budget-av: cam reset failed (timeout).\n"); |
219 | saa7146_setgpio(saa, 2, SAA7146_GPIO_OUTHI); /* disable card */ | 219 | saa7146_setgpio(saa, 2, SAA7146_GPIO_OUTHI); /* disable card */ |
220 | saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTHI); /* Vcc off */ | ||
221 | return -ETIMEDOUT; | 220 | return -ETIMEDOUT; |
222 | } | 221 | } |
223 | 222 | ||
@@ -276,7 +275,6 @@ static int ciintf_poll_slot_status(struct dvb_ca_en50221 *ca, int slot, int open | |||
276 | { | 275 | { |
277 | printk(KERN_INFO "budget-av: cam ejected\n"); | 276 | printk(KERN_INFO "budget-av: cam ejected\n"); |
278 | saa7146_setgpio(saa, 2, SAA7146_GPIO_OUTHI); /* disable card */ | 277 | saa7146_setgpio(saa, 2, SAA7146_GPIO_OUTHI); /* disable card */ |
279 | saa7146_setgpio(saa, 0, SAA7146_GPIO_OUTHI); /* Vcc off */ | ||
280 | budget_av->slot_status = 0; | 278 | budget_av->slot_status = 0; |
281 | } | 279 | } |
282 | } | 280 | } |