aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-07-19 10:30:43 +0100
committerMark Brown <broonie@linaro.org>2013-07-19 10:30:43 +0100
commit0a37d59e3c8c2299f8931df0cb1c0f525047fab5 (patch)
tree932ce8b019e13274910111b9b944f050d3d36c63 /block
parent9bca3d7f7c5865700303e8bce0eac57bab76bcc7 (diff)
parentcb5d8be972cfbea114ea56fd63ed5ce1644863df (diff)
downloadlinaro-lsk-0a37d59e3c8c2299f8931df0cb1c0f525047fab5.tar.gz
Merge tag 'v3.10.1' into linux-linaro-lsk
This is the 3.10.1 stable release
Diffstat (limited to 'block')
-rw-r--r--block/genhd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/genhd.c b/block/genhd.c
index e9094b375c0..dadf42b454a 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -512,7 +512,7 @@ static void register_disk(struct gendisk *disk)
ddev->parent = disk->driverfs_dev;
- dev_set_name(ddev, disk->disk_name);
+ dev_set_name(ddev, "%s", disk->disk_name);
/* delay uevents, until we scanned partition table */
dev_set_uevent_suppress(ddev, 1);