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

This commit is contained in:
Wolfgang Denk 2011-01-12 23:57:05 +01:00
commit 072f4125f1

View File

@ -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;
}
/**