From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 20 Jun 2016 15:25:44 +0000 (-0700)
Subject: Merge 4.7-rc4 into staging-next
X-Git-Tag: v4.8-rc1~193^2~62
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=af52739b922f656eb1f39016fabaabe4baeda2e2;p=linux.git

Merge 4.7-rc4 into staging-next

We want the fixes in here, and we can resolve a merge issue in
drivers/iio/industrialio-trigger.c

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

af52739b922f656eb1f39016fabaabe4baeda2e2
diff --cc drivers/iio/industrialio-trigger.c
index 672911293987,0c52dfe64977..7c15c3092d5d
--- a/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@@ -217,15 -220,14 +223,14 @@@ static int iio_trigger_attach_poll_func
  	ret = request_threaded_irq(pf->irq, pf->h, pf->thread,
  				   pf->type, pf->name,
  				   pf);
- 	if (ret < 0) {
- 		module_put(pf->indio_dev->info->driver_module);
- 		return ret;
- 	}
+ 	if (ret < 0)
+ 		goto out_put_irq;
  
+ 	/* Enable trigger in driver */
 -	if (trig->ops && trig->ops->set_trigger_state && notinuse) {
 +	if (trig->ops->set_trigger_state && notinuse) {
  		ret = trig->ops->set_trigger_state(trig, true);
  		if (ret < 0)
- 			module_put(pf->indio_dev->info->driver_module);
+ 			goto out_free_irq;
  	}
  
  	return ret;