]> git.sur5r.net Git - u-boot/blobdiff - drivers/net/smc911x.h
net: Fix build regression in cmd_pxe.c
[u-boot] / drivers / net / smc911x.h
index 8ce08a91e28e58011dd89a47c4e964c962c67a2a..f63a0695e375f7f916359b8b62274f6ef06041db 100644 (file)
@@ -471,8 +471,11 @@ static void smc911x_reset(struct eth_device *dev)
 {
        int timeout;
 
-       /* Take out of PM setting first */
-       if (smc911x_reg_read(dev, PMT_CTRL) & PMT_CTRL_READY) {
+       /*
+        *  Take out of PM setting first
+        *  Device is already wake up if PMT_CTRL_READY bit is set
+        */
+       if ((smc911x_reg_read(dev, PMT_CTRL) & PMT_CTRL_READY) == 0) {
                /* Write to the bytetest will take out of powerdown */
                smc911x_reg_write(dev, BYTE_TEST, 0x0);
 
@@ -481,7 +484,7 @@ static void smc911x_reset(struct eth_device *dev)
                while (timeout-- &&
                        !(smc911x_reg_read(dev, PMT_CTRL) & PMT_CTRL_READY))
                        udelay(10);
-               if (!timeout) {
+               if (timeout < 0) {
                        printf(DRIVERNAME
                                ": timeout waiting for PM restore\n");
                        return;
@@ -497,7 +500,7 @@ static void smc911x_reset(struct eth_device *dev)
        while (timeout-- && smc911x_reg_read(dev, E2P_CMD) & E2P_CMD_EPC_BUSY)
                udelay(10);
 
-       if (!timeout) {
+       if (timeout < 0) {
                printf(DRIVERNAME ": reset timeout\n");
                return;
        }