Commit 60761c10 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'char-misc-3.16-rc2' of git://

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://
  MAINTAINERS: add entry for VMware Balloon driver
  w1: mxc_w1: Fix incorrect "presence" status
  Revert "uio: fix vma io range check in mmap"
parents e6934ab4 73b35d07
......@@ -9744,6 +9744,14 @@ L:
S: Supported
F: arch/x86/kernel/cpu/vmware.c
M: Xavier Deguillard <>
M: Philip Moltmann <>
M: "VMware, Inc." <>
S: Maintained
F: drivers/misc/vmw_balloon.c
M: Shreyas Bhatewara <>
M: "VMware, Inc." <>
......@@ -17,7 +17,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
* Maintained by: Dmitry Torokhov <>
* Maintained by: Xavier Deguillard <>
* Philip Moltmann <>
......@@ -655,7 +655,7 @@ static int uio_mmap_physical(struct vm_area_struct *vma)
if (mem->addr & ~PAGE_MASK)
return -ENODEV;
if (vma->vm_end - vma->vm_start > PAGE_ALIGN(mem->size))
if (vma->vm_end - vma->vm_start > mem->size)
return -EINVAL;
vma->vm_ops = &uio_physical_vm_ops;
......@@ -66,7 +66,7 @@ static u8 mxc_w1_ds2_reset_bus(void *data)
return !!(reg_val & MXC_W1_CONTROL_PST);
return !(reg_val & MXC_W1_CONTROL_PST);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment