From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 29 Oct 2012 15:37:12 +0000 (-0700)
Subject: Merge 3.7-rc3 into staging-next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cb1f6268acd7f1bca7153fa9ca187ffb73f60ab8;p=openwrt%2Fstaging%2Fblogic.git

Merge 3.7-rc3 into staging-next

This resolves the conflict with:
	drivers/staging/comedi/drivers/amplc_dio200.c
and syncs up the changes that happened in the staging directory for
3.7-rc3.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

cb1f6268acd7f1bca7153fa9ca187ffb73f60ab8
diff --cc drivers/staging/comedi/drivers/ni_labpc.c
index 40012506334f,b5a19a0863fb..ab51c2678b9d
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@@ -775,9 -770,10 +775,11 @@@ static int labpc_attach(struct comedi_d
  
  void labpc_common_detach(struct comedi_device *dev)
  {
 +	struct labpc_private *devpriv = dev->private;
  	struct comedi_subdevice *s;
  
+ 	if (!thisboard)
+ 		return;
  	if (dev->subdevices) {
  		s = &dev->subdevices[2];
  		subdev_8255_cleanup(dev, s);