Re: [PATCH] staging: comedi: amplc_pci230: fix DACOUT write

[Ian Abbott]

On 2014-09-08 20:34, Hartley Sweeten wrote:
> On Monday, September 08, 2014 12:15 PM, Greg Kroah-Hartman wrote:
> > On Tue, Aug 19, 2014 at 12:32:36PM +0100, Ian Abbott wrote:
> > > Commit 4f9c63fe5333b27ab23ed399830c7977f6970744 ("staging: comedi:
> > > amplc_pci230: refactor iobase addresses") removed some parentheses
> > > (presumably to keep the line withing 80 chars) in
> > > `pci230_ao_write_nofifo()` when writing to the DACOUT1 or DACOUT2
> > > registers, but it removed the wrong parentheses.  Fix it.
> > >
> > > Signed-off-by: Ian Abbott <abbotti@xxxxxxxxx>
> > > ---
> > > This bug is in linux-next master and staging-next.
> > > ---
> > >   drivers/staging/comedi/drivers/amplc_pci230.c | 2 +-
> > >   1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c
> > > index 0fd212f..dd69e47 100644
> > > --- a/drivers/staging/comedi/drivers/amplc_pci230.c
> > > +++ b/drivers/staging/comedi/drivers/amplc_pci230.c
> > > @@ -628,7 +628,7 @@ static inline void pci230_ao_write_nofifo(struct comedi_device *dev,
> > >
> > >   	/* Write mangled datum to appropriate DACOUT register. */
> > >   	outw(pci230_ao_mangle_datum(dev, datum),
> > > -	     devpriv->daqio + ((chan) == 0) ? PCI230_DACOUT1 : PCI230_DACOUT2);
> > > +	     devpriv->daqio + (chan == 0 ? PCI230_DACOUT1 : PCI230_DACOUT2));
> > >   }
> > >
> > >   static inline void pci230_ao_write_fifo(struct comedi_device *dev,
> > > --
> > > 2.0.4
> >
> > This doesn't apply to my tree anymore, is it still needed?
>
> Looks like you already applied a similar patch from Dan Carpenter:
>
> commit 94254d1baec765b22cc5df3a9a16a8cc9a79d406
> Author: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
> Date:   Tue Aug 26 10:55:51 2014 +0300
>
>      staging: comedi: amplc_pci230: fix a precedence bug

No, it's no longer needed.

--
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@xxxxxxxxx>        )=-
-=( Tel: +44 (0)161 477 1898   FAX: +44 (0)161 718 3587         )=-
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/