diff options
author | David S. Miller <davem@davemloft.net> | 2008-05-01 04:14:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-05-02 08:22:51 -0400 |
commit | 32039f4954938e4d761032d7046254d08d0db54c (patch) | |
tree | 91d20357c05700a0e205442774606457fe762d4d | |
parent | c26d3c0138970778fabe114df99dffb34a04b1d7 (diff) |
serial: Fix sparc driver name strings.
They were all "serial" so if multiple of these drivers registered,
we'd trigger sysfs directory creation errors:
[ 1.695793] proc_dir_entry 'serial' already registered
[ 1.695839] Call Trace:
[ 1.831891] [00000000004f2534] create_proc_entry+0x7c/0x98
[ 1.833608] [00000000004f3a58] proc_tty_register_driver+0x40/0x70
[ 1.833663] [0000000000594700] tty_register_driver+0x1fc/0x208
[ 1.835371] [00000000005aade4] uart_register_driver+0x134/0x16c
[ 1.841762] [00000000005ac274] sunserial_register_minors+0x34/0x68
[ 1.841818] [00000000007db2a4] sunsu_init+0xf8/0x150
[ 1.867697] [00000000007c62a4] kernel_init+0x190/0x330
[ 1.939147] [0000000000426cf8] kernel_thread+0x38/0x48
[ 1.939198] [00000000006a0d90] rest_init+0x18/0x5c
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/serial/sunhv.c | 2 | ||||
-rw-r--r-- | drivers/serial/sunsab.c | 2 | ||||
-rw-r--r-- | drivers/serial/sunsu.c | 2 | ||||
-rw-r--r-- | drivers/serial/sunzilog.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c index be0fe152891b..145c0281495d 100644 --- a/drivers/serial/sunhv.c +++ b/drivers/serial/sunhv.c | |||
@@ -392,7 +392,7 @@ static struct uart_ops sunhv_pops = { | |||
392 | 392 | ||
393 | static struct uart_driver sunhv_reg = { | 393 | static struct uart_driver sunhv_reg = { |
394 | .owner = THIS_MODULE, | 394 | .owner = THIS_MODULE, |
395 | .driver_name = "serial", | 395 | .driver_name = "sunhv", |
396 | .dev_name = "ttyS", | 396 | .dev_name = "ttyS", |
397 | .major = TTY_MAJOR, | 397 | .major = TTY_MAJOR, |
398 | }; | 398 | }; |
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c index 543f93741e6f..9ff5b38f3bee 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/serial/sunsab.c | |||
@@ -826,7 +826,7 @@ static struct uart_ops sunsab_pops = { | |||
826 | 826 | ||
827 | static struct uart_driver sunsab_reg = { | 827 | static struct uart_driver sunsab_reg = { |
828 | .owner = THIS_MODULE, | 828 | .owner = THIS_MODULE, |
829 | .driver_name = "serial", | 829 | .driver_name = "sunsab", |
830 | .dev_name = "ttyS", | 830 | .dev_name = "ttyS", |
831 | .major = TTY_MAJOR, | 831 | .major = TTY_MAJOR, |
832 | }; | 832 | }; |
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index 4e2302d43ab1..03806a935209 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c | |||
@@ -1173,7 +1173,7 @@ out: | |||
1173 | 1173 | ||
1174 | static struct uart_driver sunsu_reg = { | 1174 | static struct uart_driver sunsu_reg = { |
1175 | .owner = THIS_MODULE, | 1175 | .owner = THIS_MODULE, |
1176 | .driver_name = "serial", | 1176 | .driver_name = "sunsu", |
1177 | .dev_name = "ttyS", | 1177 | .dev_name = "ttyS", |
1178 | .major = TTY_MAJOR, | 1178 | .major = TTY_MAJOR, |
1179 | }; | 1179 | }; |
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c index 90a20a152ebf..7e9fa5ef0eb7 100644 --- a/drivers/serial/sunzilog.c +++ b/drivers/serial/sunzilog.c | |||
@@ -1023,7 +1023,7 @@ static struct uart_sunzilog_port *sunzilog_irq_chain; | |||
1023 | 1023 | ||
1024 | static struct uart_driver sunzilog_reg = { | 1024 | static struct uart_driver sunzilog_reg = { |
1025 | .owner = THIS_MODULE, | 1025 | .owner = THIS_MODULE, |
1026 | .driver_name = "ttyS", | 1026 | .driver_name = "sunzilog", |
1027 | .dev_name = "ttyS", | 1027 | .dev_name = "ttyS", |
1028 | .major = TTY_MAJOR, | 1028 | .major = TTY_MAJOR, |
1029 | }; | 1029 | }; |