redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ks8842: Fix ks8842_tx_frame() for 16bit case. 

As reported by Andrew:

drivers/net/ks8842.c: In function 'ks8842_handle_rx':
drivers/net/ks8842.c:428: warning: 'status' may be used uninitialized in this function

Just use the 32-bit status for all reads, and delete the useless
cast to 'int' when reading a u16 into 'len'.

Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
David S. Miller 2010-07-19 15:25:04 -07:00
parent d6d9ca0fec
commit e2df8b7f66
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ks8842.c
View File

@ -424,16 +424,14 @@ static int ks8842_tx_frame(struct sk_buff *skb, struct net_device *netdev)
static void ks8842_rx_frame(struct net_device *netdev,
struct ks8842_adapter *adapter)
{
u16 status16;
u32 status;
int len;
if (adapter->conf_flags & KS884X_16BIT) {
status16 = ks8842_read16(adapter, 17, REG_QMU_DATA_LO);
len = (int)ks8842_read16(adapter, 17, REG_QMU_DATA_HI);
len &= 0xffff;
status = ks8842_read16(adapter, 17, REG_QMU_DATA_LO);
len = ks8842_read16(adapter, 17, REG_QMU_DATA_HI);
netdev_dbg(netdev, "%s - rx_data: status: %x\n",
__func__, status16);
__func__, status);
} else {
status = ks8842_read32(adapter, 17, REG_QMU_DATA_LO);
len = (status >> 16) & 0x7ff;