diff --git a/utils/btrfs-progs/Makefile b/utils/btrfs-progs/Makefile
index 6a8431fd2f..bea3d033ee 100644
--- a/utils/btrfs-progs/Makefile
+++ b/utils/btrfs-progs/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=btrfs-progs
 PKG_VERSION:=5.4.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/kdave/btrfs-progs
diff --git a/utils/btrfs-progs/files/btrfs-scan.init b/utils/btrfs-progs/files/btrfs-scan.init
index 608d3d6c59..6b9ab62df9 100644
--- a/utils/btrfs-progs/files/btrfs-scan.init
+++ b/utils/btrfs-progs/files/btrfs-scan.init
@@ -1,7 +1,9 @@
 #!/bin/sh
 
 preinit_btrfs_scan() {
-	grep -vq btrfs /proc/filesystems || btrfs device scan
+	if grep -q btrfs /proc/filesystems; then
+		 btrfs device scan
+	fi
 }
 
 boot_hook_add preinit_main preinit_btrfs_scan