From b63ae2f864f8444f0b7e142643465b72d48b572d Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Thu, 20 Oct 2011 18:49:29 +0800 Subject: [PATCH] --- yaml --- r: 270911 b: refs/heads/master c: 064a4bcee4114e519ce22d56d2eb8e9dfa653804 h: refs/heads/master i: 270909: 5ec61239d9ad9f223e67ff3571148d916c6a09ce 270907: 774d73df5afe3381d850e8466c040391a511ea44 270903: c6f59ee9206a1982469691e140907a1e5a8b3304 270895: d67fff097aba05b596329e8f21321deb3f850264 270879: 45bceef2bf75d39c99afec08aab1ce1e5fb376b1 270847: abf67a1a5ca8f9127733c189650ee8e7ab4b5232 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/sgtl5000.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d515d5a46d8f..544ccf7aa05b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b13de7aa754eaa274fc9ab018191bcdcb21bc45 +refs/heads/master: 064a4bcee4114e519ce22d56d2eb8e9dfa653804 diff --git a/trunk/sound/soc/codecs/sgtl5000.c b/trunk/sound/soc/codecs/sgtl5000.c index 83950022b96e..32b5bbdae523 100644 --- a/trunk/sound/soc/codecs/sgtl5000.c +++ b/trunk/sound/soc/codecs/sgtl5000.c @@ -754,7 +754,7 @@ static int ldo_regulator_enable(struct regulator_dev *dev) /* set voltage to register */ snd_soc_update_bits(codec, SGTL5000_CHIP_LINREG_CTRL, - (0x1 << 4) - 1, reg); + SGTL5000_LINREG_VDDD_MASK, reg); snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER, SGTL5000_LINEREG_D_POWERUP, @@ -780,7 +780,7 @@ static int ldo_regulator_disable(struct regulator_dev *dev) /* clear voltage info */ snd_soc_update_bits(codec, SGTL5000_CHIP_LINREG_CTRL, - (0x1 << 4) - 1, 0); + SGTL5000_LINREG_VDDD_MASK, 0); ldo->enabled = 0; @@ -1115,7 +1115,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec) /* set voltage to register */ snd_soc_update_bits(codec, SGTL5000_CHIP_LINREG_CTRL, - (0x1 << 4) - 1, 0x8); + SGTL5000_LINREG_VDDD_MASK, 0x8); /* * if vddd linear reg has been enabled,