From: Thierry Reding <thierry.reding@gmail.com>
To: Wolfram Sang <wsa@the-dreams.de>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Lars-Peter Clausen <lars@metafoo.de>,
Lv Zheng <lv.zheng@intel.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the pm tree
Date: Mon, 14 Oct 2013 16:48:07 +0200 [thread overview]
Message-ID: <1381762088-18880-7-git-send-email-treding@nvidia.com> (raw)
In-Reply-To: <1381762088-18880-1-git-send-email-treding@nvidia.com>
Today's linux-next merge of the pm tree (5d5e5df) got conflicts in
drivers/i2c/i2c-core.c
caused by commits 0acc2b3 (i2c: Remove redundant 'driver' field from the
i2c_client struct) and a76e9bd (i2c: attach/detach I2C client device to
the ACPI power domain).
I fixed them up (see below). Please verify that the resolution looks
good.
Thanks,
Thierry
---
diff --cc drivers/i2c/i2c-core.c
index 111b2c6,03a8ae6..5923cfa
--- 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;
}
next prev parent reply other threads:[~2013-10-14 14:48 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-14 14:48 linux-next: Tree for Oct 14 Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of the block tree Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of the drm-intel tree Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of the drm tree Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of th imx-mxs tree Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of the omap_dss2 tree Thierry Reding
2013-10-15 6:47 ` Tomi Valkeinen
2013-10-14 14:48 ` Thierry Reding [this message]
2013-10-14 14:48 ` linux-next: manual merge of the spi tree Thierry Reding
2013-10-14 16:44 ` Mika Westerberg
2013-10-14 18:58 ` linux-next: Tree for Oct 14 (bcache) Randy Dunlap
2013-10-14 20:27 ` Mark Brown
[not found] ` <20131014202723.GQ2443-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2013-10-15 8:46 ` Thierry Reding
[not found] ` <20131015084631.GK7856-AwZRO8vwLAwmlAP/+Wk3EA@public.gmane.org>
2013-10-15 9:36 ` Mark Brown
[not found] ` <525C3EC2.20404-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2013-10-15 8:44 ` Thierry Reding
2013-10-14 19:36 ` [PATCH -next] netdev: inet_timewait_sock.h missing semi-colon when KMEMCHECK is enabled Randy Dunlap
2013-10-14 19:53 ` Joe Perches
2013-10-14 20:47 ` Randy Dunlap
2013-10-14 21:24 ` Joe Perches
2013-10-14 21:25 ` Joe Perches
2013-10-17 19:57 ` David Miller
2013-10-14 19:38 ` [PATCH -next] misc: fix various misc/mic/host/ build errors Randy Dunlap
2013-10-16 19:26 ` Greg Kroah-Hartman
2013-10-16 19:41 ` Randy Dunlap
2013-10-16 19:44 ` Greg Kroah-Hartman
2013-10-16 20:30 ` Thierry Reding
2013-10-16 20:37 ` Greg Kroah-Hartman
2013-10-17 14:02 ` Thierry Reding
2013-10-17 14:15 ` Greg Kroah-Hartman
2013-10-17 14:16 ` Mark Brown
2013-10-17 14:21 ` Thierry Reding
2013-10-17 14:49 ` Greg Kroah-Hartman
2013-10-16 20:47 ` Mark Brown
2013-10-14 19:39 ` [PATCH -next] staging/mt29f_spinand: fix build error when ONDIEECC not enabled Randy Dunlap
2013-10-14 20:51 ` linux-next: Tree for Oct 14 (ceph) Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1381762088-18880-7-git-send-email-treding@nvidia.com \
--to=thierry.reding@gmail.com \
--cc=lars@metafoo.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lv.zheng@intel.com \
--cc=rjw@rjwysocki.net \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).