From: Ben Collins <ben.collins@ubuntu.com>
To: Kyle McMartin <kyle@mcmartin.ca>
Cc: Ben Collins <bcollins@ubuntu.com>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 04/15] i386: Handle HP laptop rebooting properly.
Date: Wed, 04 Jan 2006 17:56:12 -0500 [thread overview]
Message-ID: <1136415372.4430.47.camel@grayson> (raw)
In-Reply-To: <20060104224250.GA32177@quicksilver.road.mcmartin.ca>
On Wed, 2006-01-04 at 17:42 -0500, Kyle McMartin wrote:
> On Wed, Jan 04, 2006 at 04:59:44PM -0500, Ben Collins wrote:
> > + { /* HP laptops have weird reboot issues */
> > + .callback = set_bios_reboot,
> > + .ident = "HP Laptop",
> > + .matches = {
> > + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
> > + DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq"),
> > + },
> > + },
> > { /* Handle problems with rebooting on HP nc6120 */
> > .callback = set_bios_reboot,
> > .ident = "HP Compaq nc6120",
> >
>
> Looks like the entry below could be removed, as it's now covered by
> the above.
That's correct, so here's a better trivial patch to just broaden the
existing entry.
Signed-off-by: Ben Collins <bcollins@ubuntu.com>
diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot.c
index 2afe0f8..2fa5803 100644
--- a/arch/i386/kernel/reboot.c
+++ b/arch/i386/kernel/reboot.c
@@ -111,12 +111,12 @@ static struct dmi_system_id __initdata r
DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 2400"),
},
},
- { /* Handle problems with rebooting on HP nc6120 */
+ { /* Handle problems with rebooting on HP laptops */
.callback = set_bios_reboot,
- .ident = "HP Compaq nc6120",
+ .ident = "HP Compaq Laptop",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
- DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq nc6120"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq"),
},
},
{ }
--
Ben Collins <ben.collins@ubuntu.com>
Developer
Ubuntu Linux
next prev parent reply other threads:[~2006-01-04 22:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-04 21:59 [PATCH 04/15] i386: Handle HP laptop rebooting properly Ben Collins
2006-01-04 22:42 ` Kyle McMartin
2006-01-04 22:56 ` Ben Collins [this message]
2006-01-05 8:50 ` Ulrich Mueller
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=1136415372.4430.47.camel@grayson \
--to=ben.collins@ubuntu.com \
--cc=bcollins@ubuntu.com \
--cc=kyle@mcmartin.ca \
--cc=linux-kernel@vger.kernel.org \
/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