diff options
| author | Deepak Nibade <dnibade@nvidia.com> | 2013-08-14 16:23:39 +0530 |
|---|---|---|
| committer | Deepak Nibade <dnibade@nvidia.com> | 2013-08-14 16:23:39 +0530 |
| commit | 9282699d7fd7954f11d59254e568e5d4bfbbe71a (patch) | |
| tree | 4d945260bc8eb63b0db0423ad55ad7021eb5d4ac /block | |
| parent | 933d6b11dbd7fda89ac094321d0cd9992afb5592 (diff) | |
| parent | 67e6589a34ea5360b00869aaaec4a844c29cf713 (diff) | |
Merge branch 'linux-3.4.57' into rel-17
Bug 1348440
Change-Id: If25c49f027dc2a69642f7ed4733e965962b2a5a2
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-sysfs.c | 2 | ||||
| -rw-r--r-- | block/genhd.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index cf150011d808..262ed815e071 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -200,6 +200,8 @@ queue_store_##name(struct request_queue *q, const char *page, size_t count) \ unsigned long val; \ ssize_t ret; \ ret = queue_var_store(&val, page, count); \ + if (ret < 0) \ + return ret; \ if (neg) \ val = !val; \ \ diff --git a/block/genhd.c b/block/genhd.c index 3321781839df..c910654d60a6 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -520,7 +520,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); |