From: Thierry Reding <treding@nvidia.com>
Date: Fri, 25 Oct 2013 09:30:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'pm/linux-next'
X-Git-Tag: next-20131025~72
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=df584071e3d6a57f90ff4c8a379792cfab065c31;p=karo-tx-linux.git

Merge remote-tracking branch 'pm/linux-next'

Conflicts:
	drivers/i2c/i2c-core.c
---

df584071e3d6a57f90ff4c8a379792cfab065c31
diff --cc drivers/i2c/i2c-core.c
index 111b2c6089e6,75ba8608383e..5923cfa390c8
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@@ -254,10 -254,13 +254,12 @@@ static int i2c_device_probe(struct devi
  					client->flags & I2C_CLIENT_WAKE);
  	dev_dbg(dev, "probe\n");
  
+ 	acpi_dev_pm_attach(&client->dev, true);
  	status = driver->probe(client, i2c_match_id(driver->id_table, client));
- 	if (status)
+ 	if (status) {
 -		client->driver = NULL;
  		i2c_set_clientdata(client, NULL);
- 
+ 		acpi_dev_pm_detach(&client->dev, true);
+ 	}
  	return status;
  }
  
@@@ -278,9 -281,11 +280,9 @@@ static int i2c_device_remove(struct dev
  		dev->driver = NULL;
  		status = 0;
  	}
 -	if (status == 0) {
 -		client->driver = NULL;
 +	if (status == 0)
  		i2c_set_clientdata(client, NULL);
- 
 -	}
+ 	acpi_dev_pm_detach(&client->dev, true);
  	return status;
  }