arm64: dts: rk3399-sapphire: add tc358749x device

[firefly-linux-kernel-4.4.55.git] / block / partition-generic.c

diff --git a/block/partition-generic.c b/block/partition-generic.c
index ae95e963c5bb15df14a96b77a50c8a9302f23f53..91327dbfbb1d5f61002b6028914fc2e4bb81d1da 100644 (file)
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
@@ -360,15 +360,20 @@ struct hd_struct *add_partition(struct gendisk *disk, int partno,
                        goto out_del;
        }
 
+       err = hd_ref_init(p);
+       if (err) {
+               if (flags & ADDPART_FLAG_WHOLEDISK)
+                       goto out_remove_file;
+               goto out_del;
+       }
+
        /* everything is up and running, commence */
        rcu_assign_pointer(ptbl->part[partno], p);
 
        /* suppress uevent if the disk suppresses it */
        if (!dev_get_uevent_suppress(ddev))
                kobject_uevent(&pdev->kobj, KOBJ_ADD);
-
-       if (!hd_ref_init(p))
-               return p;
+       return p;
 
 out_free_info:
        free_part_info(p);
@@ -377,6 +382,8 @@ out_free_stats:
 out_free:
        kfree(p);
        return ERR_PTR(err);
+out_remove_file:
+       device_remove_file(pdev, &dev_attr_whole_disk);
 out_del:
        kobject_put(p->holder_dir);
        device_del(pdev);