summaryrefslogtreecommitdiff
path: root/net/phonet
diff options
context:
space:
mode:
authorPhilip Rakity <prakity@nvidia.com>2013-07-04 12:23:25 +0100
committerDan Willemsen <dwillemsen@nvidia.com>2013-09-26 19:46:27 -0700
commit3ac5102fab19c3c74081801207db176a8b3c630b (patch)
treef467ec741fb35b1e0f9cc5945f6187fd43272118 /net/phonet
parent63c57a7a07bc205f48bdfc838732077edf4692a7 (diff)
net: phonet: Fix warning messages
Reviewed-on: http://git-master/r/245093 (cherry picked from commit 4fb060fe8028a645919277275618269fa5eb9d70) Change-Id: I413bd2f981702462efc31b92239ab4fa53dde48b Signed-off-by: Philip Rakity <prakity@nvidia.com> (cherry picked from commit 2343967b8c35d37bd7dc5024521c9f61fafc8d75) Reviewed-on: http://git-master/r/271453 Reviewed-by: Scott Peterson <speterson@nvidia.com>
Diffstat (limited to 'net/phonet')
-rw-r--r--net/phonet/ld_phonet.c1
-rw-r--r--net/phonet/socket.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/net/phonet/ld_phonet.c b/net/phonet/ld_phonet.c
index 10af8c030bda..2a8d4aad51f6 100644
--- a/net/phonet/ld_phonet.c
+++ b/net/phonet/ld_phonet.c
@@ -322,7 +322,6 @@ static void ld_phonet_ldisc_initiate_transfer \
struct sk_buff *skb = NULL;
unsigned int msglen = 0;
- int i = 0;
struct phonethdr *ph = NULL;
diff --git a/net/phonet/socket.c b/net/phonet/socket.c
index 88d756b8908e..78998a25a2d0 100644
--- a/net/phonet/socket.c
+++ b/net/phonet/socket.c
@@ -465,7 +465,7 @@ static int pn_socket_ioctl(struct socket *sock, unsigned int cmd,
if (get_user(type, (__u16 __user *)arg))
return -EFAULT;
- printk(KERN_DEBUG "Phonet register resource type %d on %x\n",
+ printk(KERN_DEBUG "Phonet register resource type %d on %p\n",
type, pn);
pn->resource_type = type;
return 0;