From 0410f4a5a40f6ad33da88d03aa24660e9e0018b7 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 23 Dec 2011 00:44:36 +0000 Subject: [PATCH] --- yaml --- r: 279053 b: refs/heads/master c: 681f16232c49de06fb3683a8b128a95dbda9413c h: refs/heads/master i: 279051: 2e06ab25f6e6160516ef1ff80262591649600290 v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/pegasus.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ee3fa16d4104..cc783aff734b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d4dde5215779f4099730194ad30624fdba3d8b2 +refs/heads/master: 681f16232c49de06fb3683a8b128a95dbda9413c diff --git a/trunk/drivers/net/usb/pegasus.c b/trunk/drivers/net/usb/pegasus.c index 908b42710399..5d99b8cacd7d 100644 --- a/trunk/drivers/net/usb/pegasus.c +++ b/trunk/drivers/net/usb/pegasus.c @@ -517,7 +517,7 @@ static inline int reset_mac(pegasus_t *pegasus) for (i = 0; i < REG_TIMEOUT; i++) { get_registers(pegasus, EthCtrl1, 1, &data); if (~data & 0x08) { - if (loopback & 1) + if (loopback) break; if (mii_mode && (pegasus->features & HAS_HOME_PNA)) set_register(pegasus, Gpio1, 0x34); @@ -561,7 +561,7 @@ static int enable_net_traffic(struct net_device *dev, struct usb_device *usb) data[1] |= 0x10; /* set 100 Mbps */ if (mii_mode) data[1] = 0; - data[2] = (loopback & 1) ? 0x09 : 0x01; + data[2] = loopback ? 0x09 : 0x01; memcpy(pegasus->eth_regs, data, sizeof(data)); ret = set_registers(pegasus, EthCtrl0, 3, data);