diff --git a/block/blk-settings.c b/block/blk-settings.c
index 0fe16f987cdec7856e80d7f1531a8cc2829fac1f..2f1005da530c7ef6e9caaea1a905b1265abfab02 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -465,8 +465,6 @@ static unsigned int queue_limit_discard_alignment(
 	/* Why are these in bytes, not sectors? */
 	alignment = lim->discard_alignment >> SECTOR_SHIFT;
 	granularity = lim->discard_granularity >> SECTOR_SHIFT;
-	if (!granularity)
-		return 0;
 
 	/* Offset of the partition start in 'granularity' sectors */
 	offset = sector_div(sector, granularity);