leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: dgap: Fixed iomem accesses in dgap.c

Browse Source 
I changed dereferences from iomem into the adequate ioread function.

Signed-off-by: Pascal COMBES <pascom@orange.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Pascal COMBES 2014-05-24 15:58:09 +02:00 committed by Greg Kroah-Hartman
parent f8628a47ba
commit 77870a1b85
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/dgap/dgap.c
View File

@ -1431,8 +1431,8 @@ static int dgap_tty_init(struct board_t *brd)
ch->ch_dsr = DM_DSR; ch->ch_dsr = DM_DSR;
} }
ch->ch_taddr = vaddr + ((ch->ch_bs->tx_seg) << 4); ch->ch_taddr = vaddr + (ioread16(&(ch->ch_bs->tx_seg)) << 4);
ch->ch_raddr = vaddr + ((ch->ch_bs->rx_seg) << 4); ch->ch_raddr = vaddr + (ioread16(&(ch->ch_bs->rx_seg)) << 4);
ch->ch_tx_win = 0; ch->ch_tx_win = 0;
ch->ch_rx_win = 0; ch->ch_rx_win = 0;
ch->ch_tsize = readw(&(ch->ch_bs->tx_max)) + 1; ch->ch_tsize = readw(&(ch->ch_bs->tx_max)) + 1;
@ -4958,8 +4958,8 @@ static uint dgap_get_custom_baud(struct channel_t *ch)
* Go get from fep mem, what the fep * Go get from fep mem, what the fep
* believes the custom baud rate is. * believes the custom baud rate is.
*/ */
offset = ((((*(unsigned short __iomem *)(vaddr + ECS_SEG)) << 4) + offset = (ioread16(vaddr + ECS_SEG) << 4) + (ch->ch_portnum * 0x28)
(ch->ch_portnum * 0x28) + LINE_SPEED)); + LINE_SPEED;
value = readw(vaddr + offset); value = readw(vaddr + offset);
return value; return value;
@ -5506,10 +5506,10 @@ static int dgap_event(struct board_t *bd)
event = bd->re_map_membase + tail + EVSTART; event = bd->re_map_membase + tail + EVSTART;
port = event[0]; port = ioread8(event);
reason = event[1]; reason = ioread8(event + 1);
modem = event[2]; modem = ioread8(event + 2);
b1 = event[3]; b1 = ioread8(event + 3);
/* /*
* Make sure the interrupt is valid. * Make sure the interrupt is valid.