50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
From 03f4f0b232a65b033edc0ffbfa907ca7f25a68a8 Mon Sep 17 00:00:00 2001
|
|
From: Manu Abraham <abraham.manu@gmail.com>
|
|
Date: Fri, 4 Dec 2009 05:22:57 -0300
|
|
Subject: [PATCH 065/120] V4L/DVB (13763): [Mantis] HIF I/O: trim delays a bit appropriately
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Manu Abraham <manu@linuxtv.org>
|
|
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
(cherry picked from commit 8e0d58ecee2abc12f298862b7f9a90d1593e8006)
|
|
|
|
Signed-off-by: Bjørn Mork <bjorn@mork.no>
|
|
---
|
|
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 1ccd869..880b996 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;
|
|
}
|
|
--
|
|
1.7.1
|
|
|