aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/w1
diff options
context:
space:
mode:
authorDmitry Artamonow <mad_soft@inbox.ru>2012-04-02 01:42:22 -0400
committerJiri Kosina <jkosina@suse.cz>2012-04-02 21:38:14 -0400
commita03abdcb8e537912c9c44f283747b995d1788d23 (patch)
treed4d27e813068601708c12def227f8166cc463123 /drivers/w1
parent409a3e98132c3a4f2aa2854995f8a9dd16cf11ac (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: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/w1')
-rw-r--r--drivers/w1/w1.c2
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 }