diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/mfd/tps6507x.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/mfd/tps6507x.c')
| -rw-r--r-- | drivers/mfd/tps6507x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/tps6507x.c b/drivers/mfd/tps6507x.c index fc0197649281..33ba7723c967 100644 --- a/drivers/mfd/tps6507x.c +++ b/drivers/mfd/tps6507x.c | |||
| @@ -68,7 +68,7 @@ static int tps6507x_i2c_write_device(struct tps6507x_dev *tps6507x, char reg, | |||
| 68 | u8 msg[TPS6507X_MAX_REGISTER + 1]; | 68 | u8 msg[TPS6507X_MAX_REGISTER + 1]; |
| 69 | int ret; | 69 | int ret; |
| 70 | 70 | ||
| 71 | if (bytes > (TPS6507X_MAX_REGISTER + 1)) | 71 | if (bytes > TPS6507X_MAX_REGISTER) |
| 72 | return -EINVAL; | 72 | return -EINVAL; |
| 73 | 73 | ||
| 74 | msg[0] = reg; | 74 | msg[0] = reg; |