summaryrefslogtreecommitdiffstats
path: root/fs/squashfs
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2016-12-20 10:33:32 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-01-09 13:41:12 +0100
commit1d117c4888d3fc9cc23e0d1e42e69463ea0c083d (patch)
treea84de5af2cb4a7ddb3de99a06b6c9f5dbf764ac4 /fs/squashfs
parentf49b415b92319bbc9fdee0fe06b62476f276811a (diff)
downloadbarebox-1d117c4888d3fc9cc23e0d1e42e69463ea0c083d.tar.gz
barebox-1d117c4888d3fc9cc23e0d1e42e69463ea0c083d.tar.xz
fs: squashfs: don't reference UBI symbols if UBI isn't compiled in
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@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'fs/squashfs')
-rw-r--r--fs/squashfs/squashfs.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/squashfs/squashfs.c b/fs/squashfs/squashfs.c
index c4d0bac974..4f4a307daf 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))