Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 257474
b: refs/heads/master
c: f06f136
h: refs/heads/master
v: v3
  • Loading branch information
Mark Brown committed May 27, 2011
1 parent 46aac46 commit 67aa49a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2cdcd951c456fecbeb11fc42aa7d90f172dc58ef
refs/heads/master: f06f136fe0217174657e325279672d4b73ed4d87
7 changes: 3 additions & 4 deletions trunk/sound/soc/soc-cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 67aa49a

Please sign in to comment.