diff --git a/[refs] b/[refs] index 71d9ebde8b5f..cddda720debb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18552b8f227bddf569dade5c69798a37839ea913 +refs/heads/master: 032ebf2620ef99a4fedaa0f77dc2272095ac5863 diff --git a/trunk/fs/partitions/check.c b/trunk/fs/partitions/check.c index 45ae7dd3c650..7ef1f094de91 100644 --- a/trunk/fs/partitions/check.c +++ b/trunk/fs/partitions/check.c @@ -533,6 +533,7 @@ void del_gendisk(struct gendisk *disk) devfs_remove_disk(disk); + kobject_uevent(&disk->kobj, KOBJ_REMOVE); if (disk->holder_dir) kobject_unregister(disk->holder_dir); if (disk->slave_dir) @@ -545,7 +546,7 @@ void del_gendisk(struct gendisk *disk) kfree(disk_name); } put_device(disk->driverfs_dev); + disk->driverfs_dev = NULL; } - kobject_uevent(&disk->kobj, KOBJ_REMOVE); kobject_del(&disk->kobj); }