From e7dee3aeed5f7fb88b258a91efcd6cf4695cc282 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sun, 22 Jan 2012 17:55:38 +0000 Subject: ar71xx: wrt160nl_part: include module.h and fix compiler warnings SVN-Revision: 29856 --- target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c b/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c index eabb47e..d979365 100644 --- a/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c +++ b/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c @@ -22,6 +22,7 @@ */ #include +#include #include #include @@ -91,11 +92,15 @@ static int wrt160nl_parse_partitions(struct mtd_info *master, struct uimage_header *uheader; size_t retlen; unsigned int kernel_len; - unsigned int uboot_len = max(master->erasesize, WRT160NL_UBOOT_LEN); - unsigned int nvram_len = max(master->erasesize, WRT160NL_NVRAM_LEN); - unsigned int art_len = max(master->erasesize, WRT160NL_ART_LEN); + unsigned int uboot_len; + unsigned int nvram_len; + unsigned int art_len; int ret; + uboot_len = max_t(unsigned int, master->erasesize, WRT160NL_UBOOT_LEN); + nvram_len = max_t(unsigned int, master->erasesize, WRT160NL_NVRAM_LEN); + art_len = max_t(unsigned int, master->erasesize, WRT160NL_ART_LEN); + header = vmalloc(sizeof(*header)); if (!header) { return -ENOMEM; -- cgit v1.1