diff options
| author | Manu Abraham | 2009-12-04 09:11:14 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2010-01-17 14:55:34 +0100 |
| commit | 6053240f5cc914d40ac9c7afe15008bf3e46359c (patch) | |
| tree | 5a7cdd5b07c43722945f9cb7e57b527eb732169d /drivers/media/dvb/mantis/mantis_hif.c | |
| parent | V4L/DVB (13742): [Mantis] Implement PCMCIA I/O Rd/Wr operations (diff) | |
| download | kernel-qcow2-linux-6053240f5cc914d40ac9c7afe15008bf3e46359c.tar.gz kernel-qcow2-linux-6053240f5cc914d40ac9c7afe15008bf3e46359c.tar.xz kernel-qcow2-linux-6053240f5cc914d40ac9c7afe15008bf3e46359c.zip | |
V4L/DVB (13743): [Mantis CA] Use DVB_CA Tuple parser
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/mantis/mantis_hif.c')
| -rw-r--r-- | drivers/media/dvb/mantis/mantis_hif.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c index 42aedf7a0147..6a1ea96c16d9 100644 --- a/drivers/media/dvb/mantis/mantis_hif.c +++ b/drivers/media/dvb/mantis/mantis_hif.c @@ -111,10 +111,10 @@ int mantis_hif_write_mem(struct mantis_ca *ca, u32 addr, u8 data) return 0; } -int mantis_hif_read_iom(struct mantis_ca *ca, u32 addr, u32 count, u32 *data) +int mantis_hif_read_iom(struct mantis_ca *ca, u32 addr) { struct mantis_pci *mantis = ca->ca_priv; - u32 hif_addr = 0; + u32 data, hif_addr = 0; hif_addr &= ~MANTIS_GPIF_PCMCIAREG; hif_addr |= MANTIS_GPIF_HIFRDWRN; @@ -131,14 +131,14 @@ int mantis_hif_read_iom(struct mantis_ca *ca, u32 addr, u32 count, u32 *data) } udelay(50); ca->hif_job_queue &= ~MANTIS_HIF_IOMRD; - *data = mmread(MANTIS_GPIF_HIFDIN); + data = mmread(MANTIS_GPIF_HIFDIN); hif_addr |= MANTIS_GPIF_PCMCIAREG; mmwrite(hif_addr, MANTIS_GPIF_HIFADDR); - return 0; + return data; } -int mantis_hif_write_iom(struct mantis_ca *ca, u32 addr, u32 data) +int mantis_hif_write_iom(struct mantis_ca *ca, u32 addr, u8 data) { struct mantis_pci *mantis = ca->ca_priv; u32 hif_addr = 0; |