diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-04-28 12:03:32 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-04-28 12:03:32 +0800 |
| commit | 832dfd1ee2d35398b31108bef4a75a1b8dd4289a (patch) | |
| tree | 1cbfd813ac1fe90679ead40603e0f9377b194274 /block | |
| parent | c2a5f1f420a99274b988c928e67827fe7e5c911f (diff) | |
| parent | 12f4e1f54a1334bcd5f9586fc9eb7baefb14b826 (diff) | |
Merge tag 'v4.4.64' into linux-linaro-lsk-v4.4
This is the 4.4.64 stable release
Diffstat (limited to 'block')
| -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 a5bed6bc869d..3032453a89e6 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); |