diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-21 12:43:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-21 12:43:19 -0400 |
| commit | 60761c10904593f08e7a015718f26d2013b9b8f2 (patch) | |
| tree | 1b0bf2418e66595012ab7e965a2c8ac3fa0860b7 /drivers/w1 | |
| parent | e6934ab460e18d2229de2ef98b2745c39b83c17b (diff) | |
| parent | 73b35d07ee20d6af95359fb86540528709dd58bb (diff) | |
Merge tag 'char-misc-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char / misc driver fixes from Greg KH:
"Here are 3 patches, one a revert of the UIO patch you objected to in
3.16-rc1 and that no one wanted to defend, a w1 driver bugfix, and a
MAINTAINERS update for the vmware balloon driver.
All of these, except for the MAINTAINERS update which just got added,
have been in linux-next just fine"
* tag 'char-misc-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
MAINTAINERS: add entry for VMware Balloon driver
w1: mxc_w1: Fix incorrect "presence" status
Revert "uio: fix vma io range check in mmap"
Diffstat (limited to 'drivers/w1')
| -rw-r--r-- | drivers/w1/masters/mxc_w1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c index 67b067a3e2ab..a5df5e89d456 100644 --- a/drivers/w1/masters/mxc_w1.c +++ b/drivers/w1/masters/mxc_w1.c | |||
| @@ -66,7 +66,7 @@ static u8 mxc_w1_ds2_reset_bus(void *data) | |||
| 66 | 66 | ||
| 67 | udelay(100); | 67 | udelay(100); |
| 68 | } | 68 | } |
| 69 | return !!(reg_val & MXC_W1_CONTROL_PST); | 69 | return !(reg_val & MXC_W1_CONTROL_PST); |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | /* | 72 | /* |