Merge branch 'master' of git://git.denx.de/u-boot-ubi

15 years ago · 072f4125f1
parent 83e5c1c1e1 c7b7d4550d
commit 072f4125f1
1 changed files with 2 additions and 1 deletions
--- a/fs/ubifs/misc.h
+++ b/fs/ubifs/misc.h
@ -260,7 +260,8 @@ struct ubifs_branch *ubifs_idx_branch(const struct ubifs_info *c,
 static inline void *ubifs_idx_key(const struct ubifs_info *c,
 				  const struct ubifs_idx_node *idx)
 {
-	return (void *)((struct ubifs_branch *)idx->branches)->key;
+	const __u8 *branch = idx->branches;
+	return (void *)((struct ubifs_branch *)branch)->key;
 }

 /**