korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 00:04:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Char / Misc driver fixes for 3.16-rc2

Browse Source 
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.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iEYEABECAAYFAlOkkTEACgkQMUfUDdst+ynIKACgxyvwXygqwiKaNutDvwrP9l+e
 3joAn0gW1wVUq+7r/msb7sWosuNF9S2F
 =kc9k
 -----END PGP SIGNATURE-----

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"
This commit is contained in:
Linus Torvalds 2014-06-21 06:43:19 -10:00
commit 60761c1090
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MAINTAINERS
View File

@ -9744,6 +9744,14 @@ L: virtualization@lists.linux-foundation.org
S: Supported
F: arch/x86/kernel/cpu/vmware.c
VMWARE BALLOON DRIVER
M: Xavier Deguillard <xdeguillard@vmware.com>
M: Philip Moltmann <moltmann@vmware.com>
M: "VMware, Inc." <pv-drivers@vmware.com>
L: linux-kernel@vger.kernel.org
S: Maintained
F: drivers/misc/vmw_balloon.c
VMWARE VMXNET3 ETHERNET DRIVER
M: Shreyas Bhatewara <sbhatewara@vmware.com>
M: "VMware, Inc." <pv-drivers@vmware.com>

3
drivers/misc/vmw_balloon.c
View File

@ -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 <dtor@vmware.com>
* Maintained by: Xavier Deguillard <xdeguillard@vmware.com>
* Philip Moltmann <moltmann@vmware.com>
*/
/*

2
drivers/uio/uio.c
View File

@ -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;

2
drivers/w1/masters/mxc_w1.c
View File

@ -66,7 +66,7 @@ static u8 mxc_w1_ds2_reset_bus(void *data)
udelay(100);
}
return !!(reg_val & MXC_W1_CONTROL_PST);
return !(reg_val & MXC_W1_CONTROL_PST);
}
/*