diff --git a/super.c b/super.c
index 769dcdf4ac10..e89c56f5fb90 100644
--- a/super.c
+++ b/super.c
@@ -741,10 +741,11 @@ static int exfat_fill_super(struct super_block *sb, void *data, int silent)
 	if (opts->discard) {
 		struct request_queue *q = bdev_get_queue(sb->s_bdev);
 
-		if (!blk_queue_discard(q))
+		if (!blk_queue_discard(q)) {
 			exfat_msg(sb, KERN_WARNING,
 				"mounting with \"discard\" option, but the device does not support discard");
-		opts->discard = 0;
+			opts->discard = 0;
+		}
 	}
 #else
 	struct exfat_sb_info *sbi;