Merge remote-tracking branch 'asoc/fix/rt5677' into asoc-linus

[linux-2.6-microblaze.git] / kernel / padata.c

diff --git a/kernel/padata.c b/kernel/padata.c
index 161402f..b38bea9 100644 (file)
--- a/kernel/padata.c
+++ b/kernel/padata.c
@@ -917,15 +917,10 @@ static ssize_t show_cpumask(struct padata_instance *pinst,
        else
                cpumask = pinst->cpumask.pcpu;
 
-       len = bitmap_scnprintf(buf, PAGE_SIZE, cpumask_bits(cpumask),
-                              nr_cpu_ids);
-       if (PAGE_SIZE - len < 2)
-               len = -EINVAL;
-       else
-               len += sprintf(buf + len, "\n");
-
+       len = snprintf(buf, PAGE_SIZE, "%*pb\n",
+                      nr_cpu_ids, cpumask_bits(cpumask));
        mutex_unlock(&pinst->lock);
-       return len;
+       return len < PAGE_SIZE ? len : -EINVAL;
 }
 
 static ssize_t store_cpumask(struct padata_instance *pinst,