[PATCH 1/9] fs: squashfs: don't reference UBI symbols if UBI isn't compiled in

Lucas Stach l.stach at pengutronix.de
Tue Dec 20 01:33:32 PST 2016


There is no point in trying to append a UBI root option, if there is
no UBI support in barebox.

Signed-off-by: Lucas Stach <l.stach at pengutronix.de>
---
 fs/squashfs/squashfs.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fs/squashfs/squashfs.c b/fs/squashfs/squashfs.c
index c4d0bac97443..4f4a307dafdd 100644
--- a/fs/squashfs/squashfs.c
+++ b/fs/squashfs/squashfs.c
@@ -120,6 +120,9 @@ void squashfs_set_rootarg(struct squashfs_priv *priv, struct fs_device_d *fsdev)
 	struct mtd_info *mtd;
 	char *str;
 
+	if (!IS_ENABLED(CONFIG_MTD_UBI))
+		return;
+
 	ubi_vol = ubi_open_volume_cdev(fsdev->cdev, UBI_READONLY);
 
 	if (IS_ERR(ubi_vol))
-- 
2.11.0




More information about the barebox mailing list