aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/pcmcia/pcnet_cs.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index 6bc48a0673ca..6323988dfa1d 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -521,7 +521,7 @@ static int pcnet_config(struct pcmcia_device *link)
521 int i, last_ret, last_fn, start_pg, stop_pg, cm_offset; 521 int i, last_ret, last_fn, start_pg, stop_pg, cm_offset;
522 int has_shmem = 0; 522 int has_shmem = 0;
523 u_short buf[64]; 523 u_short buf[64];
524 hw_info_t *hw_info; 524 hw_info_t *local_hw_info;
525 DECLARE_MAC_BUF(mac); 525 DECLARE_MAC_BUF(mac);
526 526
527 DEBUG(0, "pcnet_config(0x%p)\n", link); 527 DEBUG(0, "pcnet_config(0x%p)\n", link);
@@ -590,23 +590,23 @@ static int pcnet_config(struct pcmcia_device *link)
590 dev->if_port = 0; 590 dev->if_port = 0;
591 } 591 }
592 592
593 hw_info = get_hwinfo(link); 593 local_hw_info = get_hwinfo(link);
594 if (hw_info == NULL) 594 if (local_hw_info == NULL)
595 hw_info = get_prom(link); 595 local_hw_info = get_prom(link);
596 if (hw_info == NULL) 596 if (local_hw_info == NULL)
597 hw_info = get_dl10019(link); 597 local_hw_info = get_dl10019(link);
598 if (hw_info == NULL) 598 if (local_hw_info == NULL)
599 hw_info = get_ax88190(link); 599 local_hw_info = get_ax88190(link);
600 if (hw_info == NULL) 600 if (local_hw_info == NULL)
601 hw_info = get_hwired(link); 601 local_hw_info = get_hwired(link);
602 602
603 if (hw_info == NULL) { 603 if (local_hw_info == NULL) {
604 printk(KERN_NOTICE "pcnet_cs: unable to read hardware net" 604 printk(KERN_NOTICE "pcnet_cs: unable to read hardware net"
605 " address for io base %#3lx\n", dev->base_addr); 605 " address for io base %#3lx\n", dev->base_addr);
606 goto failed; 606 goto failed;
607 } 607 }
608 608
609 info->flags = hw_info->flags; 609 info->flags = local_hw_info->flags;
610 /* Check for user overrides */ 610 /* Check for user overrides */
611 info->flags |= (delay_output) ? DELAY_OUTPUT : 0; 611 info->flags |= (delay_output) ? DELAY_OUTPUT : 0;
612 if ((link->manf_id == MANFID_SOCKET) && 612 if ((link->manf_id == MANFID_SOCKET) &&