From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Thu, 6 Sep 2012 01:38:11 +0000 (-0700)
Subject: staging: comedi: das800: 'dev->subdevices + 0' is already known
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=77d2f7c24725e3caa82492dd3d1cbd466b8a0abf;p=deliverable%2Flinux.git

staging: comedi: das800: 'dev->subdevices + 0' is already known

There is no need to calculate the subdevice for the call to
das800_cancel. The variable 's' in this function is set to the
'dev->read_subdev' which is the same as 'dev->subdevices + 0'.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c
index a0959a5e8747..834054d7f109 100644
--- a/drivers/staging/comedi/drivers/das800.c
+++ b/drivers/staging/comedi/drivers/das800.c
@@ -435,7 +435,7 @@ static irqreturn_t das800_interrupt(int irq, void *d)
 	if (fifo_overflow) {
 		spin_unlock_irqrestore(&dev->spinlock, irq_flags);
 		comedi_error(dev, "DAS800 FIFO overflow");
-		das800_cancel(dev, dev->subdevices + 0);
+		das800_cancel(dev, s);
 		async->events |= COMEDI_CB_ERROR | COMEDI_CB_EOA;
 		comedi_event(dev, s);
 		async->events = 0;