Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

[linux-2.6-microblaze.git] / drivers / ssb / sprom.c

diff --git a/drivers/ssb/sprom.c b/drivers/ssb/sprom.c
index 4f028a8..52d2e0f 100644 (file)
--- a/drivers/ssb/sprom.c
+++ b/drivers/ssb/sprom.c
@@ -26,9 +26,9 @@ static int sprom2hex(const u16 *sprom, char *buf, size_t buf_len,
        int i, pos = 0;
 
        for (i = 0; i < sprom_size_words; i++)
-               pos += snprintf(buf + pos, buf_len - pos - 1,
+               pos += scnprintf(buf + pos, buf_len - pos - 1,
                                "%04X", swab16(sprom[i]) & 0xFFFF);
-       pos += snprintf(buf + pos, buf_len - pos - 1, "\n");
+       pos += scnprintf(buf + pos, buf_len - pos - 1, "\n");
 
        return pos + 1;
 }