|
@@ -250,28 +250,6 @@ static struct platform_device *rb532_devs[] = {
|
|
|
&rb532_wdt
|
|
|
};
|
|
|
|
|
|
-static void __init parse_mac_addr(char *macstr)
|
|
|
-{
|
|
|
- int i, h, l;
|
|
|
-
|
|
|
- for (i = 0; i < 6; i++) {
|
|
|
- if (i != 5 && *(macstr + 2) != ':')
|
|
|
- return;
|
|
|
-
|
|
|
- h = hex_to_bin(*macstr++);
|
|
|
- if (h == -1)
|
|
|
- return;
|
|
|
-
|
|
|
- l = hex_to_bin(*macstr++);
|
|
|
- if (l == -1)
|
|
|
- return;
|
|
|
-
|
|
|
- macstr++;
|
|
|
- korina_dev0_data.mac[i] = (h << 4) + l;
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-
|
|
|
/* NAND definitions */
|
|
|
#define NAND_CHIP_DELAY 25
|
|
|
|
|
@@ -333,7 +311,10 @@ static int __init plat_setup_devices(void)
|
|
|
static int __init setup_kmac(char *s)
|
|
|
{
|
|
|
printk(KERN_INFO "korina mac = %s\n", s);
|
|
|
- parse_mac_addr(s);
|
|
|
+ if (!mac_pton(s, korina_dev0_data.mac)) {
|
|
|
+ printk(KERN_ERR "Invalid mac\n");
|
|
|
+ return -EINVAL;
|
|
|
+ }
|
|
|
return 0;
|
|
|
}
|
|
|
|