X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=fs%2Fpartitions%2Fcheck.c;h=22d38ffc9ef0b892c65e8c380f6f6682bacb398a;hb=0ce3c83a9c22f59937b86c80b478dfbffe54dbab;hp=ac32a2e8540c4fb2ac34c1c27286f1a0d624fbd1;hpb=b312362be6d9155b66f3a26d9159e0a680fbd6c5;p=powerpc.git

diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index ac32a2e854..22d38ffc9e 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -358,8 +358,7 @@ void delete_partition(struct gendisk *disk, int part)
 	p->ios[0] = p->ios[1] = 0;
 	p->sectors[0] = p->sectors[1] = 0;
 	sysfs_remove_link(&p->kobj, "subsystem");
-	if (p->holder_dir)
-		kobject_unregister(p->holder_dir);
+	kobject_unregister(p->holder_dir);
 	kobject_uevent(&p->kobj, KOBJ_REMOVE);
 	kobject_del(&p->kobj);
 	kobject_put(&p->kobj);
@@ -603,10 +602,8 @@ void del_gendisk(struct gendisk *disk)
 	disk->stamp = 0;
 
 	kobject_uevent(&disk->kobj, KOBJ_REMOVE);
-	if (disk->holder_dir)
-		kobject_unregister(disk->holder_dir);
-	if (disk->slave_dir)
-		kobject_unregister(disk->slave_dir);
+	kobject_unregister(disk->holder_dir);
+	kobject_unregister(disk->slave_dir);
 	if (disk->driverfs_dev) {
 		char *disk_name = make_block_name(disk);
 		sysfs_remove_link(&disk->kobj, "device");