Skip to contentSkip to conversation

smc91x: fix nowait printout

PATCH Applied Magnus Damm 2 participants 2 messages Sep 8, 2008 – Sep 13, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 smc91x: fix nowait printout

From: Magnus Damm <[email protected]>

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.

---

 drivers/net/smc91x.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/smc91x.c +2 -1
@@ -1961,7 +1961,8 @@ static int __init smc_probe(struct net_d
 		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)) {
Applied
#1 lore raw
Quoted 16 lines · Magnus Damm

From: Magnus Damm <[email protected]>

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.

---

 drivers/net/smc91x.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

drivers/net/smc91x.c static int __init smc_probe(struct net_d · line 1966

Quoted 7 lines
drivers/net/smc91x.c +2 -1
@@ -1961,7 +1961,8 @@ static int __init smc_probe(struct net_d
 		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]" : "");

applied