diff options
Diffstat (limited to 'sound/soc/soc-cache.c')
-rw-r--r-- | sound/soc/soc-cache.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c index 06b7b81a160..039b9532b27 100644 --- a/sound/soc/soc-cache.c +++ b/sound/soc/soc-cache.c | |||
@@ -409,9 +409,6 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, | |||
409 | codec->bulk_write_raw = snd_soc_hw_bulk_write_raw; | 409 | codec->bulk_write_raw = snd_soc_hw_bulk_write_raw; |
410 | 410 | ||
411 | switch (control) { | 411 | switch (control) { |
412 | case SND_SOC_CUSTOM: | ||
413 | break; | ||
414 | |||
415 | case SND_SOC_I2C: | 412 | case SND_SOC_I2C: |
416 | #if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE)) | 413 | #if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE)) |
417 | codec->hw_write = (hw_write_t)i2c_master_send; | 414 | codec->hw_write = (hw_write_t)i2c_master_send; |
@@ -466,6 +463,9 @@ static bool snd_soc_set_cache_val(void *base, unsigned int idx, | |||
466 | static unsigned int snd_soc_get_cache_val(const void *base, unsigned int idx, | 463 | static unsigned int snd_soc_get_cache_val(const void *base, unsigned int idx, |
467 | unsigned int word_size) | 464 | unsigned int word_size) |
468 | { | 465 | { |
466 | if (!base) | ||
467 | return -1; | ||
468 | |||
469 | switch (word_size) { | 469 | switch (word_size) { |
470 | case 1: { | 470 | case 1: { |
471 | const u8 *cache = base; | 471 | const u8 *cache = base; |