[PATCH 2/4] iio: adc: xilinx-ams: Fixed missing PS channels

Jonathan Cameron jic23 at kernel.org
Sun Jan 30 04:29:34 PST 2022


On Tue, 25 Jan 2022 09:06:34 +0100
Michael Tretter <m.tretter at pengutronix.de> wrote:

> On Thu, 20 Jan 2022 01:09:39 +0000, Robert Hancock wrote:
> > On Wed, 2022-01-19 at 19:02 -0600, Robert Hancock wrote:  
> > > The code forgot to increment num_channels for the PS channel inputs,
> > > resulting in them not being enabled as they should.
> > > 
> > > Fixes: d5c70627a794 ("iio: adc: Add Xilinx AMS driver")
> > > Signed-off-by: Robert Hancock <robert.hancock at calian.com>
> > > ---
> > >  drivers/iio/adc/xilinx-ams.c | 1 +
> > >  1 file changed, 1 insertion(+)
> > > 
> > > diff --git a/drivers/iio/adc/xilinx-ams.c b/drivers/iio/adc/xilinx-ams.c
> > > index 8343c5f74121..b93864362dac 100644
> > > --- a/drivers/iio/adc/xilinx-ams.c
> > > +++ b/drivers/iio/adc/xilinx-ams.c
> > > @@ -1224,6 +1224,7 @@ static int ams_init_module(struct iio_dev *indio_dev,
> > >  
> > >  		/* add PS channels to iio device channels */
> > >  		memcpy(channels, ams_ps_channels, sizeof(ams_ps_channels));
> > > +		num_channels = ARRAY_SIZE(ams_ps_channels);
> > >  	} else if (fwnode_property_match_string(fwnode, "compatible",
> > >  						"xlnx,zynqmp-ams-pl") == 0) {
> > >  		ams->pl_base = fwnode_iomap(fwnode, 0);  
> > 
> > Looks like this is the same change just submitted by Michael Tretter ("iio:
> > adc: xilinx-ams: Fix num_channels for PS channels").  
> 
> Thanks for pointing me here.
> 
> Reviewed-by: Michael Tretter <m.tretter at pengutronix.de>

I picked up Michael's patch and will drop this one...
(based on random email reading order. I'd argue his was first in time, but
then someone would point out next time I pick a patch up that is later than
another one :)

Thanks,

> 
> Michael




More information about the linux-arm-kernel mailing list