diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-26 12:05:47 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-26 12:05:47 +0100 |
| commit | e8f00c1b01c8b547bd1e11754634ce1913c7cc72 (patch) | |
| tree | f50e57dc2ce4ca1a3f84b6c036c989b5491dc8c5 /drivers/isdn/hisax/hfc_sx.c | |
| parent | 9ff50721e47ab0abb8b93159170f67262886ef0d (diff) | |
| parent | 50d4a790e65f5ac91a7b2720a19e80e862b40318 (diff) | |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-devm
Conflicts:
sound/soc/fsl/imx-sgtl5000.c
Diffstat (limited to 'drivers/isdn/hisax/hfc_sx.c')
| -rw-r--r-- | drivers/isdn/hisax/hfc_sx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c index dc4574f735ef..fa1fefd711cd 100644 --- a/drivers/isdn/hisax/hfc_sx.c +++ b/drivers/isdn/hisax/hfc_sx.c @@ -674,7 +674,7 @@ receive_emsg(struct IsdnCardState *cs) ptr--; *ptr++ = '\n'; *ptr = 0; - HiSax_putstatus(cs, NULL, cs->dlog); + HiSax_putstatus(cs, NULL, "%s", cs->dlog); } else HiSax_putstatus(cs, "LogEcho: ", "warning Frame too big (%d)", skb->len); } |