From ed39d69692982d3f420af2848433dc2c12157347 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 7 Oct 2010 16:38:43 -0700 Subject: [PATCH] --- yaml --- r: 220164 b: refs/heads/master c: 11465f6a7d43f3584fa6ee4a619a25d944c7af8d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d39d0aa308b6..baba545d7530 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a3bf7471e8acaab0e66a6304212218025fe1ec2 +refs/heads/master: 11465f6a7d43f3584fa6ee4a619a25d944c7af8d diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c index 62f8e09aaafa..b66730c6f85d 100644 --- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c +++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c @@ -1334,7 +1334,7 @@ wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, WL_DBG(("channel (%d), center_req (%d)\n", wl->channel, chan->center_freq)); } - WL_DBG(("ie (%p), ie_len (%d)\n", sme->ie, sme->ie_len)); + WL_DBG(("ie (%p), ie_len (%zd)\n", sme->ie, sme->ie_len)); err = wl_set_wpa_version(dev, sme); if (unlikely(err)) return err; @@ -4031,7 +4031,7 @@ void *wl_cfg80211_request_fw(s8 *file_name) set_bit(WL_FW_LOADING_DONE, &wl->fw->status); fw_entry = wl->fw->fw_entry; if (fw_entry) { - WL_DBG(("fw size (%d), data (%p)\n", fw_entry->size, + WL_DBG(("fw size (%zd), data (%p)\n", fw_entry->size, fw_entry->data)); } } else if (!test_bit(WL_NVRAM_LOADING_DONE, &wl->fw->status)) { @@ -4044,7 +4044,7 @@ void *wl_cfg80211_request_fw(s8 *file_name) set_bit(WL_NVRAM_LOADING_DONE, &wl->fw->status); fw_entry = wl->fw->fw_entry; if (fw_entry) { - WL_DBG(("nvram size (%d), data (%p)\n", fw_entry->size, + WL_DBG(("nvram size (%zd), data (%p)\n", fw_entry->size, fw_entry->data)); } } else {