diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-04-09 17:50:02 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-04-09 17:50:02 +0200 |
| commit | 50487c3a4a96d91e25d43d63262773f14961d9de (patch) | |
| tree | 9649437556ec56e5ba27e943313f093318b17b81 /sound/soc/codecs/da732x.c | |
| parent | 17c3ad030213da23158082ea90ebbe2a3940a2d2 (diff) | |
| parent | ab5d6fbdb71c183add7431243c7f615c42b643bb (diff) | |
| download | op-kernel-dev-50487c3a4a96d91e25d43d63262773f14961d9de.zip op-kernel-dev-50487c3a4a96d91e25d43d63262773f14961d9de.tar.gz | |
Merge tag 'asoc-v3.15-5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.15
A smattering of device specific fixes, nothing stands out here except
for the multiplatform fixes for Samsung and the device IDs being added
by Stephen Warren - there's no real code changes from those and they
give better robustness to the enumeration with DT.
Diffstat (limited to 'sound/soc/codecs/da732x.c')
| -rw-r--r-- | sound/soc/codecs/da732x.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c index 7d168ec..48f3fef 100644 --- a/sound/soc/codecs/da732x.c +++ b/sound/soc/codecs/da732x.c @@ -1571,7 +1571,8 @@ static int da732x_i2c_probe(struct i2c_client *i2c, } dev_info(&i2c->dev, "Revision: %d.%d\n", - (reg & DA732X_ID_MAJOR_MASK), (reg & DA732X_ID_MINOR_MASK)); + (reg & DA732X_ID_MAJOR_MASK) >> 4, + (reg & DA732X_ID_MINOR_MASK)); ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_da732x, da732x_dai, ARRAY_SIZE(da732x_dai)); |
