rtc: ensure rtc_set_alarm fails when alarms are not supported

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index e5cafa5..3032453 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -612,7 +612,7 @@ void add_disk(struct gendisk *disk)
 
        /* Register BDI before referencing it from bdev */
        bdi = &disk->queue->backing_dev_info;
-       bdi_register_dev(bdi, disk_devt(disk));
+       bdi_register_owner(bdi, disk_to_dev(disk));
 
        blk_register_region(disk_devt(disk), disk->minors, NULL,
                            exact_match, exact_lock, disk);
@@ -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);
@@ -831,6 +830,7 @@ static void disk_seqf_stop(struct seq_file *seqf, void *v)
        if (iter) {
                class_dev_iter_exit(iter);
                kfree(iter);
+               seqf->private = NULL;
        }
 }