From: H Hartley Sweeten Date: Tue, 13 Jan 2015 17:16:41 +0000 (-0700) Subject: staging: comedi: ni_labpc_isadma: move dma programming out of labpc_drain_dma() X-Git-Tag: omap-for-v4.1/prcm-dts-mfd-syscon-fix~83^2~379 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2c6bbe8e02d589a02282c2a260f912ab4f12376;p=pandora-kernel.git staging: comedi: ni_labpc_isadma: move dma programming out of labpc_drain_dma() The external caller of labpc_drain_dma() does not enable the DMA transfer. Only the call from handle_isa_dma() results in the programmed DMA operation getting enabled. For aesthetics, move the dma programming to handle_isa_dma(). Make sure the DMA operation would actually do something (dma->size != 0) before programming it to avoid enabling the DMA at the end of a stop_src == TRIG_COUNT command. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- Reading git-diff-tree failed