Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc041c20 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: ni_670x: remove subdevice pointer math 



Convert the comedi_subdevice access from pointer math to array
access.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 41e862f3

drivers/staging/comedi/drivers/ni_670x.c

+3 −3
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static int ni_670x_attach(struct comedi_device *dev, 
	if (ret)

		return ret;



	s = dev->subdevices + 0;

	s = &dev->subdevices[0];

	/* analog output subdevice */

	s->type = COMEDI_SUBD_AO;

	s->subdev_flags = SDF_WRITABLE;
@@ -271,7 +271,7 @@ static int ni_670x_attach(struct comedi_device *dev, 
	s->insn_write = &ni_670x_ao_winsn;

	s->insn_read = &ni_670x_ao_rinsn;



	s = dev->subdevices + 1;

	s = &dev->subdevices[1];

	/* digital i/o subdevice */

	s->type = COMEDI_SUBD_DIO;

	s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
@@ -298,7 +298,7 @@ static void ni_670x_detach(struct comedi_device *dev) 
	struct comedi_subdevice *s;



	if (dev->n_subdevices) {

		s = dev->subdevices + 0;

		s = &dev->subdevices[0];

		if (s)

			kfree(s->range_table_list);

	}