diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-04-28 12:03:34 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-04-28 12:03:34 +0800 |
| commit | 2ac245cc0560c95b4dfb385fbf46a888aa212224 (patch) | |
| tree | c81fcabbe3a24742ffefa4c10711f47a57dce5aa /block/genhd.c | |
| parent | 35dcea132c0ba7e49ef2388b7762d57555e54488 (diff) | |
| parent | 832dfd1ee2d35398b31108bef4a75a1b8dd4289a (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'block/genhd.c')
| -rw-r--r-- | block/genhd.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/block/genhd.c b/block/genhd.c index fad9db981675..a87e77626504 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -664,7 +664,6 @@ void del_gendisk(struct gendisk *disk) kobject_put(disk->part0.holder_dir); kobject_put(disk->slave_dir); - disk->driverfs_dev = NULL; if (!sysfs_deprecated) sysfs_remove_link(block_depr, dev_name(disk_to_dev(disk))); pm_runtime_set_memalloc_noio(disk_to_dev(disk), false); |