Merge tag 'imx-drivers-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawngu...

[linux-2.6-microblaze.git] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index 73faec4..419548e 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -246,15 +246,18 @@ struct block_device *disk_part_iter_next(struct disk_part_iter *piter)
                part = rcu_dereference(ptbl->part[piter->idx]);
                if (!part)
                        continue;
+               piter->part = bdgrab(part);
+               if (!piter->part)
+                       continue;
                if (!bdev_nr_sectors(part) &&
                    !(piter->flags & DISK_PITER_INCL_EMPTY) &&
                    !(piter->flags & DISK_PITER_INCL_EMPTY_PART0 &&
-                     piter->idx == 0))
+                     piter->idx == 0)) {
+                       bdput(piter->part);
+                       piter->part = NULL;
                        continue;
+               }
 
-               piter->part = bdgrab(part);
-               if (!piter->part)
-                       continue;
                piter->idx += inc;
                break;
        }