From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Sep 2013 18:36:27 +0000 (-0700)
Subject: Merge tag 'char-misc-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk... 
X-Git-Tag: firefly_0821_release~176^2~5473
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1d1fdd95df681f0c065d90ffaafa215a0e8825e2;p=firefly-linux-kernel-4.4.55.git

Merge tag 'char-misc-3.12-rc1' of git://git./linux/kernel/git/gregkh/char-misc

Pull char/misc patches from Greg KH:
 "Here is the big char/misc driver pull request for 3.12-rc1

  Lots of driver updates all over the char/misc tree, full details in
  the shortlog"

* tag 'char-misc-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (62 commits)
  drivers: uio: Kconfig: add MMU dependancy for UIO
  drivers: uio: Add driver for Humusoft MF624 DAQ PCI card
  drivers: uio_pdrv_genirq: use dev_get_platdata()
  drivers: uio_pruss: use dev_get_platdata()
  drivers: uio_dmem_genirq: use dev_get_platdata()
  drivers: parport: Kconfig: exclude h8300 for PARPORT_PC
  drivers: misc: ti-st: fix potential race if st_kim_start fails
  Drivers: hv: vmbus: Do not attempt to negoatiate a new version prematurely
  misc: vmw_balloon: Remove braces to fix build for clang.
  Drivers: hv: vmbus: Fix a bug in the handling of channel offers
  vme: vme_ca91cx42.c: fix to pass correct device identity to free_irq()
  VMCI: Add support for virtual IOMMU
  VMCI: Remove non-blocking/pinned queuepair support
  uio: uio_pruss: remove unnecessary platform_set_drvdata()
  parport: amiga: remove unnecessary platform_set_drvdata()
  vme: vme_vmivme7805.c: add missing __iomem annotation
  vme: vme_ca91cx42.c: add missing __iomem annotation
  vme: vme_tsi148.c: add missing __iomem annotation
  drivers/misc/hpilo: Correct panic when an AUX iLO is detected
  uio: drop unused vma_count member in uio_device struct
  ...
---

1d1fdd95df681f0c065d90ffaafa215a0e8825e2
diff --cc drivers/usb/dwc3/dwc3-omap.c
index ecd99451ee90,b26c2a4b4fb5..7f7ea62e961b
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@@ -389,10 -457,20 +437,18 @@@ static int dwc3_omap_probe(struct platf
  		return -EINVAL;
  	}
  
 -	base = devm_ioremap_nocache(dev, res->start, resource_size(res));
 -	if (!base) {
 -		dev_err(dev, "ioremap failed\n");
 -		return -ENOMEM;
 -	}
 +	base = devm_ioremap_resource(dev, res);
 +	if (IS_ERR(base))
 +		return PTR_ERR(base);
  
+ 	if (of_property_read_bool(node, "vbus-supply")) {
+ 		vbus_reg = devm_regulator_get(dev, "vbus");
+ 		if (IS_ERR(vbus_reg)) {
+ 			dev_err(dev, "vbus init failed\n");
+ 			return PTR_ERR(vbus_reg);
+ 		}
+ 	}
+ 
  	spin_lock_init(&omap->lock);
  
  	omap->dev	= dev;