diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-10-11 11:57:47 +0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-10-11 11:57:47 +0400 |
commit | 04a4e1fdd248d7a19d53e6e90f757e99093e3d29 (patch) | |
tree | ae16ad3f90d9dd726838077aae74675ba7ae51fc /drivers/isdn/hisax/q931.c | |
parent | 19e737c98479f040e23987e50596a861e5e88b92 (diff) | |
parent | e25aa82a89db9e3b09d02b5481aa375c7712a10d (diff) | |
download | linux-04a4e1fdd248d7a19d53e6e90f757e99093e3d29.tar.xz |
Merge remote-tracking branch 'wireless-next/master' into HEAD
Diffstat (limited to 'drivers/isdn/hisax/q931.c')
-rw-r--r-- | drivers/isdn/hisax/q931.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/hisax/q931.c b/drivers/isdn/hisax/q931.c index 041bf52d9d0a..af1b020a81f1 100644 --- a/drivers/isdn/hisax/q931.c +++ b/drivers/isdn/hisax/q931.c @@ -1179,7 +1179,7 @@ LogFrame(struct IsdnCardState *cs, u_char *buf, int size) dp--; *dp++ = '\n'; *dp = 0; - HiSax_putstatus(cs, NULL, cs->dlog); + HiSax_putstatus(cs, NULL, "%s", cs->dlog); } else HiSax_putstatus(cs, "LogFrame: ", "warning Frame too big (%d)", size); } @@ -1246,7 +1246,7 @@ dlogframe(struct IsdnCardState *cs, struct sk_buff *skb, int dir) } if (finish) { *dp = 0; - HiSax_putstatus(cs, NULL, cs->dlog); + HiSax_putstatus(cs, NULL, "%s", cs->dlog); return; } if ((0xfe & buf[0]) == PROTO_DIS_N0) { /* 1TR6 */ @@ -1509,5 +1509,5 @@ dlogframe(struct IsdnCardState *cs, struct sk_buff *skb, int dir) dp += sprintf(dp, "Unknown protocol %x!", buf[0]); } *dp = 0; - HiSax_putstatus(cs, NULL, cs->dlog); + HiSax_putstatus(cs, NULL, "%s", cs->dlog); } |