Merge tag 'v3.10-rc1' into stable/for-linus-3.10

[karo-tx-linux.git] / drivers / net / usb / pegasus.c

diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 09699054b54f66e65b5c168a8dec868229831147..03e8a15d7deb74d328d5e563ed2077f62c8d9687 100644 (file)
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -256,8 +256,9 @@ static int mdio_read(struct net_device *dev, int phy_id, int loc)
 static void mdio_write(struct net_device *dev, int phy_id, int loc, int val)
 {
        pegasus_t *pegasus = netdev_priv(dev);
+       u16 data = val;
 
-       write_mii_word(pegasus, phy_id, loc, (__u16 *)&val);
+       write_mii_word(pegasus, phy_id, loc, &data);
 }
 
 static int read_eprom_word(pegasus_t *pegasus, __u8 index, __u16 *retdata)