]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/net/meth.c
pm: fix try_to_freeze_tasks()'s use of do_div()
[linux-2.6-omap-h63xx.git] / drivers / net / meth.c
index 0b32648a213600fcecae9eda9496a63c996b1768..4cb364e67dc65f5d022663794e6d8d0b32a6255d 100644 (file)
@@ -287,7 +287,7 @@ int meth_reset(struct net_device *dev)
 
        /* Initial mode: 10 | Half-duplex | Accept normal packets */
        priv->mac_ctrl = METH_ACCEPT_MCAST | METH_DEFAULT_IPG;
-       if (dev->flags | IFF_PROMISC)
+       if (dev->flags & IFF_PROMISC)
                priv->mac_ctrl |= METH_PROMISC;
        mace->eth.mac_ctrl = priv->mac_ctrl;