tizen: Use unique directory prefix for baselibs packages

[platform/kernel/linux-rpi.git] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index cc32a0c..f9b81be 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -432,7 +432,9 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk,
                                DISK_MAX_PARTS);
                        disk->minors = DISK_MAX_PARTS;
                }
-               if (disk->first_minor + disk->minors > MINORMASK + 1)
+               if (disk->first_minor > MINORMASK ||
+                   disk->minors > MINORMASK + 1 ||
+                   disk->first_minor + disk->minors > MINORMASK + 1)
                        goto out_exit_elevator;
        } else {
                if (WARN_ON(disk->minors))
@@ -542,6 +544,7 @@ out_put_holder_dir:
        kobject_put(disk->part0->bd_holder_dir);
 out_del_block_link:
        sysfs_remove_link(block_depr, dev_name(ddev));
+       pm_runtime_set_memalloc_noio(ddev, false);
 out_device_del:
        device_del(ddev);
 out_free_ext_minor: