diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
| commit | a215aa7b9ab3759c047201199fba64d3042d7f13 (patch) | |
| tree | bca37493d9b2233450e6d3ffced1261d0e4f71fe /drivers/misc/ad525x_dpot-spi.c | |
| parent | d31199a77ef606f1d06894385f1852181ba6136b (diff) | |
Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso
Diffstat (limited to 'drivers/misc/ad525x_dpot-spi.c')
| -rw-r--r-- | drivers/misc/ad525x_dpot-spi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/ad525x_dpot-spi.c b/drivers/misc/ad525x_dpot-spi.c index b8c6df9c8437..6cfcb636577a 100644 --- a/drivers/misc/ad525x_dpot-spi.c +++ b/drivers/misc/ad525x_dpot-spi.c | |||
| @@ -53,13 +53,13 @@ static int write8(void *client, u8 val) | |||
| 53 | static int write16(void *client, u8 reg, u8 val) | 53 | static int write16(void *client, u8 reg, u8 val) |
| 54 | { | 54 | { |
| 55 | u8 data[2] = {reg, val}; | 55 | u8 data[2] = {reg, val}; |
| 56 | return spi_write(client, data, 1); | 56 | return spi_write(client, data, 2); |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | static int write24(void *client, u8 reg, u16 val) | 59 | static int write24(void *client, u8 reg, u16 val) |
| 60 | { | 60 | { |
| 61 | u8 data[3] = {reg, val >> 8, val}; | 61 | u8 data[3] = {reg, val >> 8, val}; |
| 62 | return spi_write(client, data, 1); | 62 | return spi_write(client, data, 3); |
| 63 | } | 63 | } |
| 64 | 64 | ||
| 65 | static int read8(void *client) | 65 | static int read8(void *client) |