]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
smc91x: fix nowait printout
authorMagnus Damm <damm@igel.co.jp>
Mon, 8 Sep 2008 05:02:56 +0000 (14:02 +0900)
committerJeff Garzik <jgarzik@redhat.com>
Wed, 24 Sep 2008 22:48:55 +0000 (18:48 -0400)
Commit c4f0e76747e80578a8f7fddd82fd0ce8127bd2f8 added nowait platform
data support. The printout code was however not updated, so the value
of SMC_NOWAIT is still used. This patch makes sure that nowait is printed
accordingly to platform data.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/net/smc91x.c

index 24768c10cadb7d1e326b3651ce6819ec08021699..53c2dda1dc89c7573a3378399e93fd26f9da26c4 100644 (file)
@@ -1961,7 +1961,8 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr,
                if (dev->dma != (unsigned char)-1)
                        printk(" DMA %d", dev->dma);
 
-               printk("%s%s\n", nowait ? " [nowait]" : "",
+               printk("%s%s\n",
+                       lp->cfg.flags & SMC91X_NOWAIT ? " [nowait]" : "",
                        THROTTLE_TX_PKTS ? " [throttle_tx]" : "");
 
                if (!is_valid_ether_addr(dev->dev_addr)) {