From: Andy Shevchenko Date: Fri, 17 Sep 2010 08:24:44 +0000 (+0300) Subject: staging: ath6kl: '&pointer[0]' to 'pointer' fix X-Git-Tag: firefly_0821_release~7613^2~3583^2~3^2~559 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=97d2354518897cfc42740637e6390eaa23e3d206;p=firefly-linux-kernel-4.4.55.git staging: ath6kl: '&pointer[0]' to 'pointer' fix Signed-off-by: Andy Shevchenko Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c index c2947bc051dd..c7922c9ff233 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 d5890d4551bf..a8b9241f7d87 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 9811ce786a07..7800778099bd 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);