projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
w1
/
w1_netlink.c
diff --git
a/drivers/w1/w1_netlink.c
b/drivers/w1/w1_netlink.c
index 351a2978ba72db5571bd56280b2cc86f23188910..dd96562372745ea11bd71d83901039423b24f403 100644
(file)
--- a/
drivers/w1/w1_netlink.c
+++ b/
drivers/w1/w1_netlink.c
@@
-680,8
+680,7
@@
static void w1_cn_callback(struct cn_msg *cn, struct netlink_skb_parms *nsp)
if (sl)
dev = sl->master;
} else {
- printk(KERN_NOTICE
- "%s: cn: %x.%x, wrong type: %u, len: %u.\n",
+ pr_notice("%s: cn: %x.%x, wrong type: %u, len: %u.\n",
__func__, cn->id.idx, cn->id.val,
msg->type, msg->len);
err = -EPROTO;