diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-17 12:17:19 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-17 12:19:31 -0400 |
| commit | 9b4f2e9576658c4e52d95dc8d309f51b2e2db096 (patch) | |
| tree | 7b1902b0f931783fccc6fee45c6f9c16b4fde5ce /drivers/char/moxa.c | |
| parent | 3c6c65f5ed5a6d307bd607aecd06d658c0934d88 (diff) | |
| parent | 803db244b9f71102e366fd689000c1417b9a7508 (diff) | |
ieee1394: merge from Linus
Conflicts: drivers/ieee1394/hosts.c
Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling
with patch "ieee1394: fix kerneldoc of hpsb_alloc_host".
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/char/moxa.c')
| -rw-r--r-- | drivers/char/moxa.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c index 4ea7bd5f4f56..a369dd6877d8 100644 --- a/drivers/char/moxa.c +++ b/drivers/char/moxa.c | |||
| @@ -142,6 +142,7 @@ typedef struct _moxa_board_conf { | |||
| 142 | 142 | ||
| 143 | static moxa_board_conf moxa_boards[MAX_BOARDS]; | 143 | static moxa_board_conf moxa_boards[MAX_BOARDS]; |
| 144 | static void __iomem *moxaBaseAddr[MAX_BOARDS]; | 144 | static void __iomem *moxaBaseAddr[MAX_BOARDS]; |
| 145 | static int loadstat[MAX_BOARDS]; | ||
| 145 | 146 | ||
| 146 | struct moxa_str { | 147 | struct moxa_str { |
| 147 | int type; | 148 | int type; |
| @@ -1688,6 +1689,8 @@ int MoxaDriverPoll(void) | |||
| 1688 | if (moxaCard == 0) | 1689 | if (moxaCard == 0) |
| 1689 | return (-1); | 1690 | return (-1); |
| 1690 | for (card = 0; card < MAX_BOARDS; card++) { | 1691 | for (card = 0; card < MAX_BOARDS; card++) { |
| 1692 | if (loadstat[card] == 0) | ||
| 1693 | continue; | ||
| 1691 | if ((ports = moxa_boards[card].numPorts) == 0) | 1694 | if ((ports = moxa_boards[card].numPorts) == 0) |
| 1692 | continue; | 1695 | continue; |
| 1693 | if (readb(moxaIntPend[card]) == 0xff) { | 1696 | if (readb(moxaIntPend[card]) == 0xff) { |
| @@ -2903,6 +2906,7 @@ static int moxaloadcode(int cardno, unsigned char __user *tmp, int len) | |||
| 2903 | } | 2906 | } |
| 2904 | break; | 2907 | break; |
| 2905 | } | 2908 | } |
| 2909 | loadstat[cardno] = 1; | ||
| 2906 | return (0); | 2910 | return (0); |
| 2907 | } | 2911 | } |
| 2908 | 2912 | ||
| @@ -2920,7 +2924,7 @@ static int moxaloadc218(int cardno, void __iomem *baseAddr, int len) | |||
| 2920 | len1 = len >> 1; | 2924 | len1 = len >> 1; |
| 2921 | ptr = (ushort *) moxaBuff; | 2925 | ptr = (ushort *) moxaBuff; |
| 2922 | for (i = 0; i < len1; i++) | 2926 | for (i = 0; i < len1; i++) |
| 2923 | usum += *(ptr + i); | 2927 | usum += le16_to_cpu(*(ptr + i)); |
| 2924 | retry = 0; | 2928 | retry = 0; |
| 2925 | do { | 2929 | do { |
| 2926 | len1 = len >> 1; | 2930 | len1 = len >> 1; |
| @@ -2992,7 +2996,7 @@ static int moxaloadc320(int cardno, void __iomem *baseAddr, int len, int *numPor | |||
| 2992 | wlen = len >> 1; | 2996 | wlen = len >> 1; |
| 2993 | uptr = (ushort *) moxaBuff; | 2997 | uptr = (ushort *) moxaBuff; |
| 2994 | for (i = 0; i < wlen; i++) | 2998 | for (i = 0; i < wlen; i++) |
| 2995 | usum += uptr[i]; | 2999 | usum += le16_to_cpu(uptr[i]); |
| 2996 | retry = 0; | 3000 | retry = 0; |
| 2997 | j = 0; | 3001 | j = 0; |
| 2998 | do { | 3002 | do { |