diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /drivers/isdn/hisax/config.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'drivers/isdn/hisax/config.c')
| -rw-r--r-- | drivers/isdn/hisax/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c index bf04d2a3cf4a..b33f53b3ca93 100644 --- a/drivers/isdn/hisax/config.c +++ b/drivers/isdn/hisax/config.c | |||
| @@ -1896,7 +1896,7 @@ static void EChannel_proc_rcv(struct hisax_d_if *d_if) | |||
| 1896 | ptr--; | 1896 | ptr--; |
| 1897 | *ptr++ = '\n'; | 1897 | *ptr++ = '\n'; |
| 1898 | *ptr = 0; | 1898 | *ptr = 0; |
| 1899 | HiSax_putstatus(cs, NULL, cs->dlog); | 1899 | HiSax_putstatus(cs, NULL, "%s", cs->dlog); |
| 1900 | } else | 1900 | } else |
| 1901 | HiSax_putstatus(cs, "LogEcho: ", | 1901 | HiSax_putstatus(cs, "LogEcho: ", |
| 1902 | "warning Frame too big (%d)", | 1902 | "warning Frame too big (%d)", |