diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-01-12 23:57:05 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-01-12 23:57:05 +0100 |
| commit | 072f4125f1df8e9a25b3d8f4298b000183763cf4 (patch) | |
| tree | 2cb6f505002b0dafd225504ccaf34c0552483ad7 | |
| parent | 83e5c1c1e1ab29a5b84807bbf7f5dc0561ec83d8 (diff) | |
| parent | c7b7d4550d0178dc302c808f974a7beb0f80d3e1 (diff) | |
| download | u-boot-imx-072f4125f1df8e9a25b3d8f4298b000183763cf4.zip u-boot-imx-072f4125f1df8e9a25b3d8f4298b000183763cf4.tar.gz u-boot-imx-072f4125f1df8e9a25b3d8f4298b000183763cf4.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ubi
| -rw-r--r-- | fs/ubifs/misc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ubifs/misc.h b/fs/ubifs/misc.h index b745d86..609232e 100644 --- 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; } /** |