diff options
author | Manu Abraham <abraham.manu@gmail.com> | 2009-12-04 03:22:57 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-01-17 08:55:37 -0500 |
commit | 8e0d58ecee2abc12f298862b7f9a90d1593e8006 (patch) | |
tree | fde3691286878bdf4efe99195d08cd98eece9964 /drivers | |
parent | 88a6fa9dfec0a585409acbb49a7f86a933b35d2b (diff) |
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>
Diffstat (limited to 'drivers')
-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) | |||
133 | dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Smart Buffer operation failed", mantis->num); | 133 | dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Smart Buffer operation failed", mantis->num); |
134 | return -EREMOTEIO; | 134 | return -EREMOTEIO; |
135 | } | 135 | } |
136 | udelay(50); | ||
137 | ca->hif_job_queue &= ~MANTIS_HIF_IOMRD; | 136 | ca->hif_job_queue &= ~MANTIS_HIF_IOMRD; |
138 | data = mmread(MANTIS_GPIF_DIN); | 137 | data = mmread(MANTIS_GPIF_DIN); |
139 | hif_addr |= MANTIS_GPIF_PCMCIAREG; | 138 | hif_addr |= MANTIS_GPIF_PCMCIAREG; |
140 | mmwrite(hif_addr, MANTIS_GPIF_ADDR); | 139 | mmwrite(hif_addr, MANTIS_GPIF_ADDR); |
140 | udelay(50); | ||
141 | 141 | ||
142 | return (u8) data; | 142 | return (u8) data; |
143 | } | 143 | } |
@@ -162,10 +162,10 @@ int mantis_hif_write_iom(struct mantis_ca *ca, u32 addr, u8 data) | |||
162 | dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Smart Buffer operation failed", mantis->num); | 162 | dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Smart Buffer operation failed", mantis->num); |
163 | return -EREMOTEIO; | 163 | return -EREMOTEIO; |
164 | } | 164 | } |
165 | udelay(50); | ||
166 | ca->hif_job_queue &= ~MANTIS_HIF_IOMWR; | 165 | ca->hif_job_queue &= ~MANTIS_HIF_IOMWR; |
167 | hif_addr |= MANTIS_GPIF_PCMCIAREG; | 166 | hif_addr |= MANTIS_GPIF_PCMCIAREG; |
168 | mmwrite(hif_addr, MANTIS_GPIF_ADDR); | 167 | mmwrite(hif_addr, MANTIS_GPIF_ADDR); |
168 | udelay(50); | ||
169 | 169 | ||
170 | return 0; | 170 | return 0; |
171 | } | 171 | } |