xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dma_slave_direction' into next_test_dirn

Browse Source 
resolved conflicts:
	drivers/media/video/mx3_camera.c
This commit is contained in:
Vinod Koul
2011-11-17 14:54:38 +05:30
parent ca7fe2db89 55ba4e5ed4
commit e0d23ef29e
55 changed files with 253 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/renesas_usbhs/fifo.c
View File

@@ -765,10 +765,10 @@ static void usbhsf_dma_prepare_tasklet(unsigned long data)
struct dma_async_tx_descriptor *desc;
struct dma_chan *chan = usbhsf_dma_chan_get(fifo, pkt);
struct device *dev = usbhs_priv_to_dev(priv);
enum dma_data_direction dir;
enum dma_transfer_direction dir;
dma_cookie_t cookie;
dir = usbhs_pipe_is_dir_in(pipe) ? DMA_FROM_DEVICE : DMA_TO_DEVICE;
dir = usbhs_pipe_is_dir_in(pipe) ? DMA_DEV_TO_MEM : DMA_MEM_TO_DEV;
sg_init_table(&sg, 1);
sg_set_page(&sg, virt_to_page(pkt->dma),