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>
This commit is contained in:
parent
d6d9ca0fec
commit
e2df8b7f66
|
@ -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,
|
static void ks8842_rx_frame(struct net_device *netdev,
|
||||||
struct ks8842_adapter *adapter)
|
struct ks8842_adapter *adapter)
|
||||||
{
|
{
|
||||||
u16 status16;
|
|
||||||
u32 status;
|
u32 status;
|
||||||
int len;
|
int len;
|
||||||
|
|
||||||
if (adapter->conf_flags & KS884X_16BIT) {
|
if (adapter->conf_flags & KS884X_16BIT) {
|
||||||
status16 = ks8842_read16(adapter, 17, REG_QMU_DATA_LO);
|
status = ks8842_read16(adapter, 17, REG_QMU_DATA_LO);
|
||||||
len = (int)ks8842_read16(adapter, 17, REG_QMU_DATA_HI);
|
len = ks8842_read16(adapter, 17, REG_QMU_DATA_HI);
|
||||||
len &= 0xffff;
|
|
||||||
netdev_dbg(netdev, "%s - rx_data: status: %x\n",
|
netdev_dbg(netdev, "%s - rx_data: status: %x\n",
|
||||||
__func__, status16);
|
__func__, status);
|
||||||
} else {
|
} else {
|
||||||
status = ks8842_read32(adapter, 17, REG_QMU_DATA_LO);
|
status = ks8842_read32(adapter, 17, REG_QMU_DATA_LO);
|
||||||
len = (status >> 16) & 0x7ff;
|
len = (status >> 16) & 0x7ff;
|
||||||
|
|
Loading…
Reference in a new issue