shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10

Browse Source
This commit is contained in:
roger
2014-09-04 13:42:36 +08:00
parent 9112b2c5a7 4d75e4f0a1
commit 760e053be1
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/mmc/host/rk_sdmmc.c
View File

@@ -2756,22 +2756,20 @@ host_put:
static void dw_mci_cmd_interrupt(struct dw_mci *host, u32 status)
{
u32 multi, unit;
u32 multi, unit = SZ_2M;
if (!host->cmd_status)
host->cmd_status = status;
if(!host->cmd)
if (!host->cmd)
goto cmd_exit;
if((MMC_STOP_TRANSMISSION != host->cmd->opcode))
{
unit = 2*1024*1024;
multi = mci_readl(host, BYTCNT)/unit;
multi += ((mci_readl(host, BYTCNT) % unit) ? 1 :0 );
multi = (multi > 0) ? multi : 1;
multi += (host->cmd->retries > 2)? 2 : host->cmd->retries;
mod_timer(&host->dto_timer, jiffies + msecs_to_jiffies(4500 * multi));//max wait 8s larger
if ((MMC_STOP_TRANSMISSION != host->cmd->opcode)) {
multi = (mci_readl(host, BYTCNT) / unit) +
((mci_readl(host, BYTCNT) % unit) ? 1 :0 ) +
((host->cmd->retries > 2) ? 2 : host->cmd->retries);
/* Max limit time: 8s for dto */
mod_timer(&host->dto_timer, jiffies + msecs_to_jiffies(4000 * multi));
}
cmd_exit:

2
drivers/staging/android/ion/ion_page_pool.c
View File

@@ -133,7 +133,7 @@ int ion_page_pool_shrink(struct ion_page_pool *pool, gfp_t gfp_mask,
int i;
bool high;
high = !!(gfp_mask & __GFP_HIGHMEM);
high = true;
for (i = 0; i < nr_to_scan; i++) {
struct page *page;