From c9cfefd9b13bbab960a37adcb33958159dc3ab20 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Sat, 23 Jun 2007 17:16:29 -0700 Subject: [PATCH] --- yaml --- r: 57981 b: refs/heads/master c: b5913bbd2ddebd9c2c6841986c29376e691dd396 h: refs/heads/master i: 57979: 931d37617fe7bebe276b7a6eed65b43a77120a6e v: v3 --- [refs] | 2 +- trunk/drivers/mfd/sm501.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b2e5a28cf59a..157d4394dc24 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 331d74750e69a2202f857d3af9323335d0d6879f +refs/heads/master: b5913bbd2ddebd9c2c6841986c29376e691dd396 diff --git a/trunk/drivers/mfd/sm501.c b/trunk/drivers/mfd/sm501.c index 72bbecf4b451..4c4412e0de24 100644 --- a/trunk/drivers/mfd/sm501.c +++ b/trunk/drivers/mfd/sm501.c @@ -843,15 +843,15 @@ static void sm501_init_regs(struct sm501_devdata *sm, sm501_init_reg(sm, SM501_GPIO31_0_CONTROL, &init->gpio_low); sm501_init_reg(sm, SM501_GPIO63_32_CONTROL, &init->gpio_high); - if (init->mclk) { - dev_info(sm->dev, "setting MCLK to %ld\n", init->mclk); - sm501_set_clock(sm->dev, SM501_CLOCK_MCLK, init->mclk); - } - if (init->m1xclk) { dev_info(sm->dev, "setting M1XCLK to %ld\n", init->m1xclk); sm501_set_clock(sm->dev, SM501_CLOCK_M1XCLK, init->m1xclk); } + + if (init->mclk) { + dev_info(sm->dev, "setting MCLK to %ld\n", init->mclk); + sm501_set_clock(sm->dev, SM501_CLOCK_MCLK, init->mclk); + } } static unsigned int sm501_mem_local[] = {