1 From 2a72cdffabd2dd290d126c9a4e544bb65b537993 Mon Sep 17 00:00:00 2001
2 From: Daniel Matuschek <daniel@hifiberry.com>
3 Date: Fri, 23 Jan 2015 16:41:17 +0100
4 Subject: [PATCH 074/114] TAS5713: return error if initialisation fails
6 Existing TAS5713 driver logs errors during initialisation, but does not return
7 an error code. Therefore even if initialisation fails, the driver will still be
8 loaded, but won't work. This patch fixes this. I2C communication error will now
9 reported correctly by a non-zero return code.
11 sound/soc/codecs/tas5713.c | 13 ++++++++++---
12 1 file changed, 10 insertions(+), 3 deletions(-)
14 --- a/sound/soc/codecs/tas5713.c
15 +++ b/sound/soc/codecs/tas5713.c
16 @@ -182,33 +182,40 @@ static int tas5713_probe(struct snd_soc_
19 ret = snd_soc_write(codec, TAS5713_ERROR_STATUS, 0x00);
20 + if (ret < 0) return ret;
23 - ret = snd_soc_write(codec, TAS5713_OSC_TRIM, 0x00);
24 + ret = snd_soc_write(codec, TAS5713_OSC_TRIM, 0x00);
25 + if (ret < 0) return ret;
29 ret = snd_soc_write(codec, TAS5713_ERROR_STATUS, 0x00);
30 + if (ret < 0) return ret;
32 // Clock mode: 44/48kHz, MCLK=64xfs
33 ret = snd_soc_write(codec, TAS5713_CLOCK_CTRL, 0x60);
34 + if (ret < 0) return ret;
37 ret = snd_soc_write(codec, TAS5713_SERIAL_DATA_INTERFACE, 0x05);
38 + if (ret < 0) return ret;
41 ret = snd_soc_write(codec, TAS5713_SYSTEM_CTRL2, 0x00);
42 + if (ret < 0) return ret;
43 ret = snd_soc_write(codec, TAS5713_SOFT_MUTE, 0x00);
44 + if (ret < 0) return ret;
47 ret = snd_soc_write(codec, TAS5713_VOL_MASTER, 0x00);
48 + if (ret < 0) return ret;
50 // Now start programming the default initialization sequence
51 for (i = 0; i < ARRAY_SIZE(tas5713_init_sequence); ++i) {
52 ret = i2c_master_send(i2c,
53 tas5713_init_sequence[i].data,
54 tas5713_init_sequence[i].size);
57 printk(KERN_INFO "TAS5713 CODEC PROBE: InitSeq returns: %d\n", ret);
59 @@ -216,7 +223,7 @@ static int tas5713_probe(struct snd_soc_
62 ret = snd_soc_write(codec, TAS5713_SYSTEM_CTRL2, 0x00);
64 + if (ret < 0) return ret;