From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Rafael J. Wysocki" <rjw@sisk•pl>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Dmitry Torokhov <dmitry.torokhov@gmail•com>
Subject: linux-next: manual merge of the suspend tree with the input tree
Date: Thu, 7 Jan 2010 15:07:23 +1100 [thread overview]
Message-ID: <20100107150723.b07d521b.sfr@canb.auug.org.au> (raw)
Hi Rafael,
Today's linux-next merge of the suspend tree got a conflict in
drivers/input/serio/serio.c between commits
386d8772980be01b94bd463ea1e745732d7eb502 ("Input: serio - use device core
to create 'id' attribute group") and
ddf1ffbd40c92ff1e58c45fa96d309788f7beb60 ("Input: serio - let device core
tell us if device was registered") from the input tree and commit
f543d6795ccfbd443a042e012a6aea15e4f4c87a ("PM: Allow serio input devices
to suspend/resume asynchronously") from the suspend tree.
I fixed it up (see below) but am not sure it this is the correct fix. I
can carry this fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/input/serio/serio.c
index c3b626e,42970e4..0000000
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@@ -547,15 -555,22 +547,17 @@@ static void serio_add_port(struct seri
}
list_add_tail(&serio->node, &serio_list);
+
if (serio->start)
serio->start(serio);
+
error = device_add(&serio->dev);
if (error)
- printk(KERN_ERR
- "serio: device_add() failed for %s (%s), error: %d\n",
+ dev_err(&serio->dev,
+ "device_add() failed for %s (%s), error: %d\n",
serio->phys, serio->name, error);
- else {
- serio->registered = true;
- error = sysfs_create_group(&serio->dev.kobj, &serio_id_attr_group);
- if (error)
- printk(KERN_ERR
- "serio: sysfs_create_group() failed for %s (%s), error: %d\n",
- serio->phys, serio->name, error);
++ else
+ device_enable_async_suspend(&serio->dev, true);
- }
}
/*
next reply other threads:[~2010-01-07 4:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-07 4:07 Stephen Rothwell [this message]
2010-01-07 4:30 ` linux-next: manual merge of the suspend tree with the input tree Dmitry Torokhov
2010-01-07 20:45 ` Rafael J. Wysocki
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=20100107150723.b07d521b.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rjw@sisk$(echo .)pl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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