aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/xirc2ps_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/pcmcia/xirc2ps_cs.c')
-rw-r--r--drivers/net/pcmcia/xirc2ps_cs.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index cf8423102538..187da21f720b 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -421,9 +421,9 @@ PrintRegisters(struct net_device *dev)
421 printk("\n"); 421 printk("\n");
422 } 422 }
423 for (page=0x40 ; page <= 0x5f; page++) { 423 for (page=0x40 ; page <= 0x5f; page++) {
424 if (page == 0x43 || (page >= 0x46 && page <= 0x4f) 424 if (page == 0x43 || (page >= 0x46 && page <= 0x4f) ||
425 || (page >= 0x51 && page <=0x5e)) 425 (page >= 0x51 && page <=0x5e))
426 continue; 426 continue;
427 printk(KDBG_XIRC "Register page %2x: ", page); 427 printk(KDBG_XIRC "Register page %2x: ", page);
428 SelectPage(page); 428 SelectPage(page);
429 for (i = 8; i < 16; i++) 429 for (i = 8; i < 16; i++)
@@ -834,9 +834,9 @@ xirc2ps_config(struct pcmcia_device * link)
834 /* Once I saw two CISTPL_FUNCE_LAN_NODE_ID entries: 834 /* Once I saw two CISTPL_FUNCE_LAN_NODE_ID entries:
835 * the first one with a length of zero the second correct - 835 * the first one with a length of zero the second correct -
836 * so I skip all entries with length 0 */ 836 * so I skip all entries with length 0 */
837 if (parse.funce.type == CISTPL_FUNCE_LAN_NODE_ID 837 if (parse.funce.type == CISTPL_FUNCE_LAN_NODE_ID &&
838 && ((cistpl_lan_node_id_t *)parse.funce.data)->nb) 838 ((cistpl_lan_node_id_t *)parse.funce.data)->nb)
839 break; 839 break;
840 } 840 }
841 if (err) { /* not found: try to get the node-id from tuple 0x89 */ 841 if (err) { /* not found: try to get the node-id from tuple 0x89 */
842 tuple.DesiredTuple = 0x89; /* data layout looks like tuple 0x22 */ 842 tuple.DesiredTuple = 0x89; /* data layout looks like tuple 0x22 */
@@ -852,8 +852,8 @@ xirc2ps_config(struct pcmcia_device * link)
852 tuple.DesiredTuple = CISTPL_FUNCE; 852 tuple.DesiredTuple = CISTPL_FUNCE;
853 for (err = first_tuple(link, &tuple, &parse); !err; 853 for (err = first_tuple(link, &tuple, &parse); !err;
854 err = next_tuple(link, &tuple, &parse)) { 854 err = next_tuple(link, &tuple, &parse)) {
855 if (parse.funce.type == 0x02 && parse.funce.data[0] == 1 855 if (parse.funce.type == 0x02 && parse.funce.data[0] == 1 &&
856 && parse.funce.data[1] == 6 && tuple.TupleDataLen == 13) { 856 parse.funce.data[1] == 6 && tuple.TupleDataLen == 13) {
857 buf[1] = 4; 857 buf[1] = 4;
858 memcpy(&parse, buf+1, 8); 858 memcpy(&parse, buf+1, 8);
859 break; 859 break;