Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e024f69d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-39-rc4' of git://codeaurora.org/quic/kernel/davidb/linux-msm:
  msm: timer: fix missing return value
  msm: Remove extraneous ffa device check
parents 96fd2d57 893b66c3

arch/arm/mach-msm/board-qsd8x50.c

+1 −4
Original line number Diff line number Diff line
@@ -160,9 +160,6 @@ static struct msm_mmc_platform_data qsd8x50_sdc1_data = { 


static void __init qsd8x50_init_mmc(void)

{

	if (machine_is_qsd8x50_ffa() || machine_is_qsd8x50a_ffa())

		vreg_mmc = vreg_get(NULL, "gp6");

	else

	vreg_mmc = vreg_get(NULL, "gp5");



	if (IS_ERR(vreg_mmc)) {

arch/arm/mach-msm/timer.c

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ int __cpuinit local_timer_setup(struct clock_event_device *evt) 


	/* Use existing clock_event for cpu 0 */

	if (!smp_processor_id())

		return;

		return 0;



	writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL);