Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 179501
b: refs/heads/master
c: 8e0d58e
h: refs/heads/master
i:
  179499: d212303
v: v3
  • Loading branch information
Manu Abraham authored and Mauro Carvalho Chehab committed Jan 17, 2010
1 parent fcf20f5 commit c1653fa
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 88a6fa9dfec0a585409acbb49a7f86a933b35d2b
refs/heads/master: 8e0d58ecee2abc12f298862b7f9a90d1593e8006
4 changes: 2 additions & 2 deletions trunk/drivers/media/dvb/mantis/mantis_hif.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down

0 comments on commit c1653fa

Please sign in to comment.