|
@@ -470,7 +470,6 @@ static inline struct rcs __iomem *rcs_base(ray_dev_t *dev)
|
|
|
static int ray_init(struct net_device *dev)
|
|
|
{
|
|
|
int i;
|
|
|
- UCHAR *p;
|
|
|
struct ccs __iomem *pccs;
|
|
|
ray_dev_t *local = netdev_priv(dev);
|
|
|
struct pcmcia_device *link = local->finder;
|
|
@@ -513,12 +512,9 @@ static int ray_init(struct net_device *dev)
|
|
|
init_startup_params(local);
|
|
|
|
|
|
/* copy mac address to startup parameters */
|
|
|
- if (parse_addr(phy_addr, local->sparm.b4.a_mac_addr)) {
|
|
|
- p = local->sparm.b4.a_mac_addr;
|
|
|
- } else {
|
|
|
+ if (!parse_addr(phy_addr, local->sparm.b4.a_mac_addr)) {
|
|
|
memcpy(&local->sparm.b4.a_mac_addr,
|
|
|
&local->startup_res.station_addr, ADDRLEN);
|
|
|
- p = local->sparm.b4.a_mac_addr;
|
|
|
}
|
|
|
|
|
|
clear_interrupt(local); /* Clear any interrupt from the card */
|