From a8d077a9232bc8c90c56da22989135f7b40cac30 Mon Sep 17 00:00:00 2001 From: Manish chopra Date: Wed, 30 Jan 2013 12:47:13 +0000 Subject: [PATCH] --- yaml --- r: 352007 b: refs/heads/master c: 1403f43a8fc8b1e1880b08a4c8a4ddac985171eb h: refs/heads/master i: 352005: ae00b7fa04fbde47b293efc76ff4957d77ab96ea 352003: c47f008cdfb52532b5412fff2eedc3f9e469d197 351999: ce666a44a1a0a85c63cc608facc0bb18f8123d4e v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4454969cdd30..7f31b829b461 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 069048f18bc51fbfd08d2e08a9003c2681ce44dd +refs/heads/master: 1403f43a8fc8b1e1880b08a4c8a4ddac985171eb diff --git a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c index 46162f8a2fcf..1e81e94b3c6b 100644 --- a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +++ b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c @@ -2374,7 +2374,7 @@ int qlcnic_83xx_flash_read32(struct qlcnic_adapter *adapter, u32 flash_addr, if (ret == -EIO) return -EIO; word = ret; - *p_data = word; + *(u32 *)p_data = word; p_data = p_data + 4; addr = addr + 4; }