diff options
| author | Manu Abraham <abraham.manu@gmail.com> | 2009-12-04 05:22:57 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-01-17 11:55:37 -0200 |
| commit | 8e0d58ecee2abc12f298862b7f9a90d1593e8006 (patch) | |
| tree | fde3691286878bdf4efe99195d08cd98eece9964 | |
| parent | 88a6fa9dfec0a585409acbb49a7f86a933b35d2b (diff) | |
| download | linux-8e0d58ecee2abc12f298862b7f9a90d1593e8006.tar.gz linux-8e0d58ecee2abc12f298862b7f9a90d1593e8006.tar.bz2 linux-8e0d58ecee2abc12f298862b7f9a90d1593e8006.zip | |
V4L/DVB (13763): [Mantis] HIF I/O: trim delays a bit appropriately
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/dvb/mantis/mantis_hif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c index 1ccd86969534..880b99634c29 100644 --- a/drivers/media/dvb/mantis/mantis_hif.c +++ b/drivers/media/dvb/mantis/mantis_hif.c @@ -133,11 +133,11 @@ int mantis_hif_read_iom(struct mantis_ca *ca, u32 addr) dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Smart Buffer operation failed", mantis->num); return -EREMOTEIO; } - udelay(50); ca->hif_job_queue &= ~MANTIS_HIF_IOMRD; data = mmread(MANTIS_GPIF_DIN); hif_addr |= MANTIS_GPIF_PCMCIAREG; mmwrite(hif_addr, MANTIS_GPIF_ADDR); + udelay(50); return (u8) data; } @@ -162,10 +162,10 @@ int mantis_hif_write_iom(struct mantis_ca *ca, u32 addr, u8 data) dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Smart Buffer operation failed", mantis->num); return -EREMOTEIO; } - udelay(50); ca->hif_job_queue &= ~MANTIS_HIF_IOMWR; hif_addr |= MANTIS_GPIF_PCMCIAREG; mmwrite(hif_addr, MANTIS_GPIF_ADDR); + udelay(50); return 0; } |