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

Merge branch 'for-39-rc4' of git://codeaurora.org/quic/kernel/davidb/linux-msm

Browse Source 
* 'for-39-rc4' of git://codeaurora.org/quic/kernel/davidb/linux-msm:
  msm: timer: fix missing return value
  msm: Remove extraneous ffa device check
This commit is contained in:
Linus Torvalds
2011-04-18 15:44:29 -07:00
parent 96fd2d57b8 893b66c39d
commit e024f69de9
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-msm/board-qsd8x50.c
View File

@@ -160,10 +160,7 @@ static struct msm_mmc_platform_data qsd8x50_sdc1_data = {
static void __init qsd8x50_init_mmc(void) static void __init qsd8x50_init_mmc(void)
{ {
if (machine_is_qsd8x50_ffa() || machine_is_qsd8x50a_ffa()) vreg_mmc = vreg_get(NULL, "gp5");
vreg_mmc = vreg_get(NULL, "gp6");
else
vreg_mmc = vreg_get(NULL, "gp5");
if (IS_ERR(vreg_mmc)) { if (IS_ERR(vreg_mmc)) {
pr_err("vreg get for vreg_mmc failed (%ld)\n", pr_err("vreg get for vreg_mmc failed (%ld)\n",

2
arch/arm/mach-msm/timer.c
View File

@@ -269,7 +269,7 @@ int __cpuinit local_timer_setup(struct clock_event_device *evt)
/* Use existing clock_event for cpu 0 */ /* Use existing clock_event for cpu 0 */
if (!smp_processor_id()) if (!smp_processor_id())
return; return 0;
writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL); writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL);