summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-06-08 14:24:53 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-06-08 14:24:53 -0400
commit934b9d1ed71cca5a220ec13e3f76d6aebf5183da (patch)
tree97d51347257a776aea9fe4b3f6c46a75725fb82d
parentbf34e68352ac9f8deae3e78c2825ac9fe373e73e (diff)
wl18xx: avoid some -Wformat warningsmaster-2012-06-08
CC drivers/net/wireless/ti/wl18xx/main.o drivers/net/wireless/ti/wl18xx/main.c: In function ‘wl18xx_conf_init’: drivers/net/wireless/ti/wl18xx/main.c:1024:3: warning: format ‘%d’ expects argument of type ‘int’, but argument 2 has type ‘long unsigned int’ [-Wformat] drivers/net/wireless/ti/wl18xx/main.c:1024:3: warning: format ‘%d’ expects argument of type ‘int’, but argument 3 has type ‘size_t’ [-Wformat] Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ti/wl18xx/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index b2ccff7d6188..ed9c3650e08a 100644
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -1022,7 +1022,8 @@ static int wl18xx_conf_init(struct wl1271 *wl, struct device *dev)
if (fw->size != WL18XX_CONF_SIZE) {
wl1271_error("configuration binary file size is wrong, "
- "expected %d got %d", WL18XX_CONF_SIZE, fw->size);
+ "expected %ld got %zd",
+ WL18XX_CONF_SIZE, fw->size);
ret = -EINVAL;
goto out;
}