diff --git a/[refs] b/[refs] index b54b8ce20d82..5a5a41ba53c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2cdcd951c456fecbeb11fc42aa7d90f172dc58ef +refs/heads/master: f06f136fe0217174657e325279672d4b73ed4d87 diff --git a/trunk/sound/soc/soc-cache.c b/trunk/sound/soc/soc-cache.c index 6d6395fad486..dab109f2f47d 100644 --- a/trunk/sound/soc/soc-cache.c +++ b/trunk/sound/soc/soc-cache.c @@ -133,12 +133,11 @@ static unsigned int snd_soc_7_9_read(struct snd_soc_codec *codec, static int snd_soc_7_9_write(struct snd_soc_codec *codec, unsigned int reg, unsigned int value) { - u8 data[2]; + u16 data; - data[0] = (reg << 1) | ((value >> 8) & 0x0001); - data[1] = value & 0x00ff; + data = cpu_to_be16((reg << 9) | (value & 0x1ff)); - return do_hw_write(codec, reg, value, data, 2); + return do_hw_write(codec, reg, value, &data, 2); } #if defined(CONFIG_SPI_MASTER)