diff options
| author | Andy Shevchenko <andy.shevchenko@gmail.com> | 2010-09-17 11:24:44 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-20 16:10:56 -0700 |
| commit | 97d2354518897cfc42740637e6390eaa23e3d206 (patch) | |
| tree | be7c5a49a72469c4a633d0a040e2a30479ad1969 /drivers/staging/ath6kl | |
| parent | b01d467ddd7470b1e9c6ccc68a1279771146abad (diff) | |
| download | kernel_samsung_tuna-97d2354518897cfc42740637e6390eaa23e3d206.zip kernel_samsung_tuna-97d2354518897cfc42740637e6390eaa23e3d206.tar.gz kernel_samsung_tuna-97d2354518897cfc42740637e6390eaa23e3d206.tar.bz2 | |
staging: ath6kl: '&pointer[0]' to 'pointer' fix
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ath6kl')
| -rw-r--r-- | drivers/staging/ath6kl/os/linux/ar6000_drv.c | 4 | ||||
| -rw-r--r-- | drivers/staging/ath6kl/os/linux/cfg80211.c | 4 | ||||
| -rw-r--r-- | drivers/staging/ath6kl/wmi/wmi.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c index c2947bc..c7922c9 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c @@ -959,7 +959,7 @@ ar6000_softmac_update(AR_SOFTC_T *ar, A_UCHAR *eeprom_data, size_t size) AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Invalid Target Type\n")); return; } - printk(KERN_DEBUG "MAC from EEPROM %pM\n", &ptr_mac[0]); + printk(KERN_DEBUG "MAC from EEPROM %pM\n", ptr_mac); /* create a random MAC in case we cannot read file from system */ ptr_mac[0] = 0; @@ -988,7 +988,7 @@ ar6000_softmac_update(AR_SOFTC_T *ar, A_UCHAR *eeprom_data, size_t size) } A_RELEASE_FIRMWARE(softmac_entry); } - printk(KERN_DEBUG "MAC from %s %pM\n", source, &ptr_mac[0]); + printk(KERN_DEBUG "MAC from %s %pM\n", source, ptr_mac); calculate_crc(ar->arTargetType, eeprom_data); } #endif /* SOFTMAC_FILE_USED */ diff --git a/drivers/staging/ath6kl/os/linux/cfg80211.c b/drivers/staging/ath6kl/os/linux/cfg80211.c index d5890d4..a8b9241 100644 --- a/drivers/staging/ath6kl/os/linux/cfg80211.c +++ b/drivers/staging/ath6kl/os/linux/cfg80211.c @@ -546,7 +546,7 @@ ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, A_UINT16 channel, AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: inform bss with bssid %pM channel %d beaconInterval %d " - "capability 0x%x\n", __func__, &mgmt->bssid[0], + "capability 0x%x\n", __func__, mgmt->bssid, ibss_channel->hw_value, beaconInterval, capability)); bss = cfg80211_inform_bss_frame(ar->wdev->wiphy, @@ -714,7 +714,7 @@ ar6k_cfg80211_scan_node(void *arg, bss_t *ni) AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("%s: bssid %pM channel %d freq %d size %d\n", __func__, - &mgmt->bssid[0], channel->hw_value, freq, size)); + mgmt->bssid, channel->hw_value, freq, size)); cfg80211_inform_bss_frame(wiphy, channel, mgmt, le16_to_cpu(size), signal, GFP_KERNEL); diff --git a/drivers/staging/ath6kl/wmi/wmi.c b/drivers/staging/ath6kl/wmi/wmi.c index 9811ce7..7800778 100644 --- a/drivers/staging/ath6kl/wmi/wmi.c +++ b/drivers/staging/ath6kl/wmi/wmi.c @@ -1458,7 +1458,7 @@ wmi_bssInfo_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len) A_DPRINTF(DBG_WMI2, (DBGFMT "bssInfo event - ch %u, rssi %02x, " "bssid \"%pM\"\n", DBGARG, bih->channel, - (unsigned char) bih->rssi, i&bih->bssid[0])); + (unsigned char) bih->rssi, bih->bssid)); if(wps_enable && (bih->frameType == PROBERESP_FTYPE) ) { wmi_node_return(wmip, bss); |