summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--block/badblocks.c2
-rw-r--r--block/genhd.c5
2 files changed, 2 insertions, 5 deletions
diff --git a/block/badblocks.c b/block/badblocks.c
index fabf6b64c2d1..37e5c0a2ef69 100644
--- a/block/badblocks.c
+++ b/block/badblocks.c
@@ -555,6 +555,8 @@ EXPORT_SYMBOL_GPL(badblocks_init);
*/
void badblocks_exit(struct badblocks *bb)
{
+ if (!bb)
+ return;
kfree(bb->page);
bb->page = NULL;
}
diff --git a/block/genhd.c b/block/genhd.c
index f463c67e6ba2..aa38cd0a66c7 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -670,11 +670,6 @@ void del_gendisk(struct gendisk *disk)
blk_unregister_queue(disk);
blk_unregister_region(disk_devt(disk), disk->minors);
- if (disk->bb) {
- badblocks_exit(disk->bb);
- kfree(disk->bb);
- }
-
part_stat_set_all(&disk->part0, 0);
disk->part0.stamp = 0;