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

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

staging: comedi: dt282x: use dev->write_subdev



Use the dev->write_subdev that was setup in the device attach instead
of accessing the dev->subdevices array directly.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9ee0de0e
Loading
Loading
Loading
Loading
+2 −3
Original line number Original line Diff line number Diff line
@@ -306,10 +306,10 @@ static void dt282x_munge(struct comedi_device *dev, unsigned short *buf,
static void dt282x_ao_dma_interrupt(struct comedi_device *dev)
static void dt282x_ao_dma_interrupt(struct comedi_device *dev)
{
{
	struct dt282x_private *devpriv = dev->private;
	struct dt282x_private *devpriv = dev->private;
	struct comedi_subdevice *s = dev->write_subdev;
	void *ptr;
	void *ptr;
	int size;
	int size;
	int i;
	int i;
	struct comedi_subdevice *s = &dev->subdevices[1];


	outw(devpriv->supcsr | DT2821_CLRDMADNE, dev->iobase + DT2821_SUPCSR);
	outw(devpriv->supcsr | DT2821_CLRDMADNE, dev->iobase + DT2821_SUPCSR);


@@ -449,7 +449,7 @@ static irqreturn_t dt282x_interrupt(int irq, void *d)
	struct comedi_device *dev = d;
	struct comedi_device *dev = d;
	struct dt282x_private *devpriv = dev->private;
	struct dt282x_private *devpriv = dev->private;
	struct comedi_subdevice *s = dev->read_subdev;
	struct comedi_subdevice *s = dev->read_subdev;
	struct comedi_subdevice *s_ao;
	struct comedi_subdevice *s_ao = dev->write_subdev;
	unsigned int supcsr, adcsr, dacsr;
	unsigned int supcsr, adcsr, dacsr;
	int handled = 0;
	int handled = 0;


@@ -458,7 +458,6 @@ static irqreturn_t dt282x_interrupt(int irq, void *d)
		return IRQ_HANDLED;
		return IRQ_HANDLED;
	}
	}


	s_ao = &dev->subdevices[1];
	adcsr = inw(dev->iobase + DT2821_ADCSR);
	adcsr = inw(dev->iobase + DT2821_ADCSR);
	dacsr = inw(dev->iobase + DT2821_DACSR);
	dacsr = inw(dev->iobase + DT2821_DACSR);
	supcsr = inw(dev->iobase + DT2821_SUPCSR);
	supcsr = inw(dev->iobase + DT2821_SUPCSR);