diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-03 14:51:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-03 14:51:08 -0300 |
| commit | b0c4835ca205296ee6352bbe885582e2c546e2ce (patch) | |
| tree | 44b80aaeb882ec990e143c72472e45b0f1a82cb4 /linux/drivers/media/video/cx18/cx18-mailbox.c | |
| parent | e92f78bc63e71d1572225b93b4ea0c31e6e6efc0 (diff) | |
| parent | aec12fb2da90fde6ec9056cec90f9a65a8b02305 (diff) | |
| download | mediapointer-dvb-s2-b0c4835ca205296ee6352bbe885582e2c546e2ce.tar.gz mediapointer-dvb-s2-b0c4835ca205296ee6352bbe885582e2c546e2ce.tar.bz2 | |
apply backout changeset
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-mailbox.c')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-mailbox.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-mailbox.c b/linux/drivers/media/video/cx18/cx18-mailbox.c index 0c5f328bc..2a5ccef91 100644 --- a/linux/drivers/media/video/cx18/cx18-mailbox.c +++ b/linux/drivers/media/video/cx18/cx18-mailbox.c @@ -94,10 +94,10 @@ static const struct cx18_api_info *find_api_info(u32 cmd) return NULL; } -static struct cx18_mailbox *cx18_mb_is_complete(struct cx18 *cx, int rpu, +static struct cx18_mailbox __iomem *cx18_mb_is_complete(struct cx18 *cx, int rpu, u32 *state, u32 *irq, u32 *req) { - struct cx18_mailbox *mb = NULL; + struct cx18_mailbox __iomem *mb = NULL; int wait_count = 0; u32 ack; @@ -142,7 +142,7 @@ static struct cx18_mailbox *cx18_mb_is_complete(struct cx18 *cx, int rpu, long cx18_mb_ack(struct cx18 *cx, const struct cx18_mailbox *mb) { const struct cx18_api_info *info = find_api_info(mb->cmd); - struct cx18_mailbox *ack_mb; + struct cx18_mailbox __iomem *ack_mb; u32 ack_irq; u8 rpu = CPU; @@ -182,7 +182,7 @@ static int cx18_api_call(struct cx18 *cx, u32 cmd, int args, u32 data[]) { const struct cx18_api_info *info = find_api_info(cmd); u32 state = 0, irq = 0, req, oldreq, err; - struct cx18_mailbox *mb; + struct cx18_mailbox __iomem *mb; wait_queue_head_t *waitq; int timeout = 100; int cnt = 0; |