aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-01-22 17:55:38 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-01-22 17:55:38 +0000
commite7dee3aeed5f7fb88b258a91efcd6cf4695cc282 (patch)
tree67074401dc02d3cd8b353309b7e7265e79da2864
parenta7d344565b7ad0e0fd06cb8763ee46271834be3e (diff)
downloadupstream-e7dee3aeed5f7fb88b258a91efcd6cf4695cc282.tar.gz
upstream-e7dee3aeed5f7fb88b258a91efcd6cf4695cc282.tar.bz2
upstream-e7dee3aeed5f7fb88b258a91efcd6cf4695cc282.zip
ar71xx: wrt160nl_part: include module.h and fix compiler warnings
SVN-Revision: 29856
-rw-r--r--target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c11
1 files 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 eabb47e029..d979365d66 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 <linux/kernel.h>
+#include <linux/module.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
@@ -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;