Commit 89877983 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

Merge branch 'fixes' into next

parents bbbd8872 e9f3fb52

drivers/mmc/host/sunxi-mmc.c

+3 −2
Original line number Diff line number Diff line
@@ -377,7 +377,8 @@ static void sunxi_mmc_init_idma_des(struct sunxi_mmc_host *host, 
		pdes[i].buf_addr_ptr1 =

			cpu_to_le32(sg_dma_address(&data->sg[i]) >>

				    host->cfg->idma_des_shift);

		pdes[i].buf_addr_ptr2 = cpu_to_le32((u32)next_desc >>

		pdes[i].buf_addr_ptr2 =

			cpu_to_le32(next_desc >>

				    host->cfg->idma_des_shift);

	}