[patch] was Re: confusion in apricot.c

Andrew G. Morgan (morgan@parc.power.net)
Mon, 21 Jul 1997 08:12:33 -0700 (PDT)

Florian La Roche wrote:
> > while (lp->scb.status, lp->scb.command)
> > ....
> >
> > Is this simply a result of an over enthusiastic search/replace or was there
> > some intended action that's not quite made it into the kernel yet?
>
> Just make a patch that changes those lines to:
> while (lp->scb.command)

Just in case this gets missed from 2.0.31, here is a (trivial) patch
(to linux/drivers/net/apricot.c):

--- apricot.c.orig Thu Feb 29 21:50:42 1996
+++ apricot.c Sat Jul 19 18:16:05 1997
@@ -298,7 +298,7 @@
i596_add_cmd(dev, &lp->tdr);

boguscnt = 200;
- while (lp->scb.status, lp->scb.command)
+ while (lp->scb.command)
if (--boguscnt == 0)
{
printk("%s: receive unit start timed out with status %4.4x, cmd %4.4x.\n",
@@ -310,7 +310,7 @@
outw(0, ioaddr+4);

boguscnt = 200;
- while (lp->scb.status, lp->scb.command)
+ while (lp->scb.command)
if (--boguscnt == 0)
{
printk("i82596 init timed out with status %4.4x, cmd %4.4x.\n",
@@ -427,7 +427,7 @@
}
}

- while (lp->scb.status, lp->scb.command)
+ while (lp->scb.command)
if (--boguscnt == 0)
{
printk("i596_cleanup_cmd timed out with status %4.4x, cmd %4.4x.\n",
@@ -445,7 +445,7 @@

if (i596_debug > 4) printk ("i596_reset\n");

- while (lp->scb.status, lp->scb.command)
+ while (lp->scb.command)
if (--boguscnt == 0)
{
printk("i596_reset timed out with status %4.4x, cmd %4.4x.\n",
@@ -462,7 +462,7 @@
/* wait for shutdown */
boguscnt = 400;

- while ((lp->scb.status, lp->scb.command) || lp->scb.command)
+ while (lp->scb.command || lp->scb.command)
if (--boguscnt == 0)
{
printk("i596_reset 2 timed out with status %4.4x, cmd %4.4x.\n",
@@ -499,7 +499,7 @@
else
{
lp->cmd_head = cmd;
- while (lp->scb.status, lp->scb.command)
+ while (lp->scb.command)
if (--boguscnt == 0)
{
printk("i596_add_cmd timed out with status %4.4x, cmd %4.4x.\n",
@@ -767,7 +767,7 @@

lp = (struct i596_private *)dev->priv;

- while (lp->scb.status, lp->scb.command)
+ while (lp->scb.command)
if (--boguscnt == 0)
{
printk("%s: i596 interrupt, timeout status %4.4x command %4.4x.\n", dev->name, lp->scb.status, lp->scb.command);

-- 
               Linux-PAM, libpwdb, Orange-Linux and Linux-GSS
                  http://parc.power.net/morgan/index.html