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

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

Pull staging tree merge from Greg KH:
 "Here's the bit staging tree pull request for 3.12-rc1.

  Lots of staging driver updates, and fixes.  Lustre is finally enabled
  in the build, and lots of cleanup started happening in it.  There's a
  new wireless driver in here, and 2 new TTY drivers, which cause the
  overall lines added/removed to be quite large on the "added" side.

  The IIO driver updates are also coming through here, as they are tied
  to the staging iio drivers"

* tag 'staging-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (942 commits)
  staging: dwc2: make dwc2_core_params documentation more complete
  staging: dwc2: validate the value for phy_utmi_width
  staging: dwc2: interpret all hwcfg and related register at init time
  staging: dwc2: properly mask the GRXFSIZ register
  staging: dwc2: remove redundant register reads
  staging: dwc2: re-use hptxfsiz variable
  staging: dwc2: simplify debug output in dwc_hc_init
  staging: dwc2: add missing shift
  staging: dwc2: simplify register shift expressions
  staging: dwc2: only read the snpsid register once
  staging: dwc2: unshift non-bool register value constants
  staging: dwc2: fix off-by-one in check for max_packet_count parameter
  staging: dwc2: remove specific fifo size constants
  Staging:BCM:DDRInit.c:Renaming __FUNCTION__
  staging: bcm: remove Version.h file.
  staging: rtl8188eu: off by one in rtw_set_802_11_add_wep()
  staging: r8188eu: copying one byte too much
  staging: rtl8188eu: || vs && typo
  staging: r8188eu: off by one bugs
  staging: crystalhd: Resolve sparse 'different base types' warnings.
  ...
---

751144271f4b63d5de9005ea4e5e6e5c7c6fd629
diff --cc drivers/staging/comedi/drivers.c
index b3b5125faa72,60fd81c71a12..317a821b7906
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@@ -482,9 -537,11 +537,11 @@@ int comedi_device_attach(struct comedi_
  		ret = comedi_device_postconfig(dev);
  	if (ret < 0) {
  		comedi_device_detach(dev);
 -		module_put(dev->driver->module);
 +		module_put(driv->module);
  	}
  	/* On success, the driver module count has been incremented. */
+ out:
+ 	mutex_unlock(&comedi_drivers_list_lock);
  	return ret;
  }