projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
drivers
/
mmc
/
host
/
imxmmc.c
diff --git
a/drivers/mmc/host/imxmmc.c
b/drivers/mmc/host/imxmmc.c
index
6ebc41e
..
f2070a1
100644
(file)
--- a/
drivers/mmc/host/imxmmc.c
+++ b/
drivers/mmc/host/imxmmc.c
@@
-262,7
+262,7
@@
static void imxmci_setup_data(struct imxmci_host *host, struct mmc_data *data)
}
/* Convert back to virtual address */
- host->data_ptr = (u16*)
(page_address(data->sg->page) + data->sg->offset
);
+ host->data_ptr = (u16*)
sg_virt(data->sg
);
host->data_cnt = 0;
clear_bit(IMXMCI_PEND_DMA_DATA_b, &host->pending_events);