diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 70211d0b187652be5336d7a4a7f0005eaaaa5d66..0dbc6eb7a7cac3d66429a1c90f6d3968fb15c60e 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -844,8 +844,7 @@ static void sd_config_discard(struct scsi_disk *sdkp, unsigned int mode)
 
 	case SD_LBP_FULL:
 	case SD_LBP_DISABLE:
-		blk_queue_max_discard_sectors(q, 0);
-		return;
+		break;
 
 	case SD_LBP_UNMAP:
 		max_blocks = min_not_zero(sdkp->max_unmap_blocks,