lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'pxa-core' and 'pxa-machines' into pxa-all

Browse Source 
Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c
This commit is contained in:
Russell King
2008-10-07 19:08:56 +01:00
committed by Russell King
parent c46c948260 af7c951d76
commit 5a89770daa
1025 changed files with 47459 additions and 14385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mmc/card/block.c
View File

@@ -103,8 +103,10 @@ static int mmc_blk_open(struct inode *inode, struct file *filp)
check_disk_change(inode->i_bdev);
ret = 0;
if ((filp->f_mode & FMODE_WRITE) && md->read_only)
if ((filp->f_mode & FMODE_WRITE) && md->read_only) {
mmc_blk_put(md);
ret = -EROFS;
}
}
return ret;

20
drivers/mmc/host/at91_mci.c
View File

@@ -621,12 +621,21 @@ static void at91_mci_send_command(struct at91mci_host *host, struct mmc_command
if (cpu_is_at91sam9260 () || cpu_is_at91sam9263())
if (host->total_length < 12)
host->total_length = 12;
host->buffer = dma_alloc_coherent(NULL,
host->total_length,
&host->physical_address, GFP_KERNEL);
host->buffer = kmalloc(host->total_length, GFP_KERNEL);
if (!host->buffer) {
pr_debug("Can't alloc tx buffer\n");
cmd->error = -ENOMEM;
mmc_request_done(host->mmc, host->request);
return;
}
at91_mci_sg_to_dma(host, data);
host->physical_address = dma_map_single(NULL,
host->buffer, host->total_length,
DMA_TO_DEVICE);
pr_debug("Transmitting %d bytes\n", host->total_length);
at91_mci_write(host, ATMEL_PDC_TPR, host->physical_address);
@@ -694,7 +703,10 @@ static void at91_mci_completed_command(struct at91mci_host *host, unsigned int s
cmd->resp[3] = at91_mci_read(host, AT91_MCI_RSPR(3));
if (host->buffer) {
dma_free_coherent(NULL, host->total_length, host->buffer, host->physical_address);
dma_unmap_single(NULL,
host->physical_address, host->total_length,
DMA_TO_DEVICE);
kfree(host->buffer);
host->buffer = NULL;
}