From eddd88f64c4ea3696f52fab21dc7fccf790ea1da Mon Sep 17 00:00:00 2001 From: Amit Beka Date: Mon, 6 Feb 2012 00:40:47 +0200 Subject: [PATCH] --- yaml --- r: 290671 b: refs/heads/master c: 858b7c74dda1d748a687a523e83cf7d1449c70f3 h: refs/heads/master i: 290669: 229919ccdf492b7682adfd8921ccbece8353dfcc 290667: 220aa4f50241b38d2f9a4d00b063eefbbe79d25b 290663: eba010dbf022e943fd0b0e08344704c53cbe7c0f 290655: 8a374d5e4fae93bbf90dabe7487e22ad67f236b0 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-testmode.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2d9811ee9a08..bf530812e8e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 637d7925910df46bb29a0260dd2fec68b50a811b +refs/heads/master: 858b7c74dda1d748a687a523e83cf7d1449c70f3 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-testmode.c b/trunk/drivers/net/wireless/iwlwifi/iwl-testmode.c index 5f00a3712707..ba5c63a023a2 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-testmode.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-testmode.c @@ -799,9 +799,10 @@ static int iwl_testmode_indirect_read(struct iwl_priv *priv, u32 addr, u32 size) addr < IWL_TM_ABS_PRPH_START + PRPH_END) { spin_lock_irqsave(&trans->reg_lock, flags); iwl_grab_nic_access(trans); - iwl_write32(trans, HBUS_TARG_PRPH_RADDR, addr); + iwl_write32(trans, HBUS_TARG_PRPH_RADDR, + addr | (3 << 24)); for (i = 0; i < size; i += 4) - priv->testmode_mem.buff_addr[i] = + *(u32 *)(priv->testmode_mem.buff_addr + i) = iwl_read32(trans, HBUS_TARG_PRPH_RDAT); iwl_release_nic_access(trans); spin_unlock_irqrestore(&trans->reg_lock, flags); @@ -833,7 +834,8 @@ static int iwl_testmode_indirect_write(struct iwl_priv *priv, u32 addr, spin_lock_irqsave(&trans->reg_lock, flags); iwl_grab_nic_access(trans); iwl_write32(trans, HBUS_TARG_PRPH_WADDR, - (addr & 0x0000FFFF) | (size << 24)); + (addr & 0x0000FFFF) | + ((size - 1) << 24)); iwl_write32(trans, HBUS_TARG_PRPH_WDAT, val); iwl_release_nic_access(trans); /* needed after consecutive writes w/o read */ @@ -844,7 +846,7 @@ static int iwl_testmode_indirect_write(struct iwl_priv *priv, u32 addr, return -EINVAL; for (i = 0; i < size; i += 4) iwl_write_prph(trans, addr+i, - *(u32 *)buf+i); + *(u32 *)(buf+i)); } } else if (iwlagn_hw_valid_rtc_data_addr(addr) || (IWLAGN_RTC_INST_LOWER_BOUND <= addr &&