From: H Hartley Sweeten Date: Fri, 20 Jun 2014 20:12:47 +0000 (-0700) Subject: staging: comedi: dt282x: remove sanity checks of 's->async->prealloc_buf' X-Git-Tag: firefly_0821_release~176^2~3491^2~1538 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ecac148c60d341c9e50e2b65744d2ffde5b884cb;p=firefly-linux-kernel-4.4.55.git staging: comedi: dt282x: remove sanity checks of 's->async->prealloc_buf' The comedi core sanity checks that the subdevice has a buffer allocated before allowing an async command to start. The helper functions in comedi_buf will also sanity check the buffer as a side effect of the 'alloc' helpers with reading or writing data for the buffer. Remove the unnecessary sanity checks in the ai/ao dma interrupt handlers. This will allow the handlers to disable the dma and then fail when they try to read/write the buffer. Currently dma is left enabled due to the sanity checks. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/dt282x.c b/drivers/staging/comedi/drivers/dt282x.c index d2a519d7be43..3071f11ba4f9 100644 --- a/drivers/staging/comedi/drivers/dt282x.c +++ b/drivers/staging/comedi/drivers/dt282x.c @@ -471,11 +471,6 @@ static void dt282x_ao_dma_interrupt(struct comedi_device *dev) outw(devpriv->supcsr | DT2821_CLRDMADNE, dev->iobase + DT2821_SUPCSR); - if (!s->async->prealloc_buf) { - dev_err(dev->class_dev, "no buffer in %s\n", __func__); - return; - } - i = devpriv->current_dma_index; ptr = devpriv->dma[i].buf; @@ -504,11 +499,6 @@ static void dt282x_ai_dma_interrupt(struct comedi_device *dev) outw(devpriv->supcsr | DT2821_CLRDMADNE, dev->iobase + DT2821_SUPCSR); - if (!s->async->prealloc_buf) { - dev_err(dev->class_dev, "no buffer in %s\n", __func__); - return; - } - i = devpriv->current_dma_index; ptr = devpriv->dma[i].buf; size = devpriv->dma[i].size;