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; }