On Wed, Jan 28, 2015 at 09:58:56AM -0700, H Hartley Sweeten wrote: > The private data 'pm', 'pt', and 'pp' array members hold the trigger mode > parameters for ports A and B. Both ports are 8-bits and the arrays are > 16-bits. > Array index 0 defines the AND mode and index 1 the OR mode parameters for both > ports. > > The valid triggers to start the async command are 0 to 3 which select the > AND/OR mode for each port. > > The 'pb_trig' (the array index for port B) in apci1500_di_inttrig_start() is > incorrect and results in an index of 0 or 2. Fix the calc so that the correct > index (0/1) is used. > > Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com> > Reported-by: Asaf Vertz <asaf.ve...@tandemg.com> > Reviewed-by: Ian Abbott <abbo...@mev.co.uk> > --- > drivers/staging/comedi/drivers/addi_apci_1500.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/staging/comedi/drivers/addi_apci_1500.c > b/drivers/staging/comedi/drivers/addi_apci_1500.c > index fc7db1d..f15aa1f 100644 > --- a/drivers/staging/comedi/drivers/addi_apci_1500.c > +++ b/drivers/staging/comedi/drivers/addi_apci_1500.c > @@ -296,7 +296,7 @@ static int apci1500_di_inttrig_start(struct comedi_device > *dev, > unsigned int pa_mode = Z8536_PAB_MODE_PMS_DISABLE; > unsigned int pb_mode = Z8536_PAB_MODE_PMS_DISABLE; > unsigned int pa_trig = trig_num & 0x01; > - unsigned int pb_trig = trig_num & 0x02; > + unsigned int pb_trig = (trig_num >> 1) & 0x01; > bool valid_trig = false; > unsigned int val; >
Doesn't apply to my tree :( greg k-h _______________________________________________ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
