Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / drivers / powercap / powercap_sys.c

diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
index 3f0b8e2..f0654a9 100644 (file)
--- a/drivers/powercap/powercap_sys.c
+++ b/drivers/powercap/powercap_sys.c
@@ -170,9 +170,8 @@ static ssize_t show_constraint_name(struct device *dev,
        if (pconst && pconst->ops && pconst->ops->get_name) {
                name = pconst->ops->get_name(power_zone, id);
                if (name) {
-                       snprintf(buf, POWERCAP_CONSTRAINT_NAME_LEN,
-                                                               "%s\n", name);
-                       buf[POWERCAP_CONSTRAINT_NAME_LEN] = '\0';
+                       sprintf(buf, "%.*s\n", POWERCAP_CONSTRAINT_NAME_LEN - 1,
+                               name);
                        len = strlen(buf);
                }
        }