diff options
author | Dmitry Artamonow <mad_soft@inbox.ru> | 2012-04-02 01:42:22 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-09 18:05:47 -0400 |
commit | ecf1948985247cf35b5536fa62e02f56476f41f1 (patch) | |
tree | 5317605efe84ccb95957a167ddaa014a1a602a9f /drivers/w1 | |
parent | 415f0a02adaea754dc85cde7b50707f7fbc4cf3f (diff) |
w1: fix slave driver registration error message
W1 core prints "Failed to register master driver" if error happens
on registering SLAVE driver. Fix it.
Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/w1')
-rw-r--r-- | drivers/w1/w1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index 9761950697b4..2f2e894ea0c8 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c | |||
@@ -1027,7 +1027,7 @@ static int __init w1_init(void) | |||
1027 | retval = driver_register(&w1_slave_driver); | 1027 | retval = driver_register(&w1_slave_driver); |
1028 | if (retval) { | 1028 | if (retval) { |
1029 | printk(KERN_ERR | 1029 | printk(KERN_ERR |
1030 | "Failed to register master driver. err=%d.\n", | 1030 | "Failed to register slave driver. err=%d.\n", |
1031 | retval); | 1031 | retval); |
1032 | goto err_out_master_unregister; | 1032 | goto err_out_master_unregister; |
1033 | } | 1033 | } |