Commit 52ae1390 authored by Marcus Alanen's avatar Marcus Alanen Committed by Linus Torvalds

[PATCH] [patch 2.5] at1700 trivial

  Bad error path..

  ret is already set to -ENODEV, no need to set them again before
  jumping out.
parent 3a1ed3f3
...@@ -310,7 +310,6 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr) ...@@ -310,7 +310,6 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr)
&& inb(ioaddr + SAPROM + 2) == 0x0e) && inb(ioaddr + SAPROM + 2) == 0x0e)
is_fmv18x = 1; is_fmv18x = 1;
else { else {
ret = -ENODEV;
goto err_out; goto err_out;
} }
...@@ -335,11 +334,10 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr) ...@@ -335,11 +334,10 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr)
} }
if (i == 8) { if (i == 8) {
goto err_out; goto err_out;
ret = -ENODEV;
} }
} else { } else {
if (fmv18x_probe_list[inb(ioaddr + IOCONFIG) & 0x07] != ioaddr) if (fmv18x_probe_list[inb(ioaddr + IOCONFIG) & 0x07] != ioaddr)
return -ENODEV; goto err_out;
irq = fmv_irqmap[(inb(ioaddr + IOCONFIG)>>6) & 0x03]; irq = fmv_irqmap[(inb(ioaddr + IOCONFIG)>>6) & 0x03];
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment