diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 28d932906f24c19e7250e6c69ec903b4a4460761..ebbd0c3fe0ed997973271ba9b57020d2519843d0 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -608,6 +608,9 @@ static int loop_switch(struct loop_device *lo, struct file *file)
  */
 static int loop_flush(struct loop_device *lo)
 {
+	/* loop not yet configured, no running thread, nothing to flush */
+	if (lo->lo_state != Lo_bound)
+		return 0;
 	return loop_switch(lo, NULL);
 }