Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752260AbZL3JSb (ORCPT ); Wed, 30 Dec 2009 04:18:31 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751797AbZL3JS1 (ORCPT ); Wed, 30 Dec 2009 04:18:27 -0500 Received: from mail.parknet.co.jp ([210.171.160.6]:38140 "EHLO mail.parknet.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751772AbZL3JSX (ORCPT ); Wed, 30 Dec 2009 04:18:23 -0500 From: OGAWA Hirofumi To: Malte =?iso-8859-1?Q?Schr=F6der?= Cc: "Rafael J. Wysocki" , Linux Kernel Mailing List , Kernel Testers List , "Andrew Morton" , "Bjorn Helgaas" , David =?iso-8859-1?Q?H=E4rdeman?= , "Len Brown" Subject: Re: [Bug #14889] System wakeup by time not working anymore References: <87k4w5u1fr.fsf@devron.myhome.or.jp> <20091230095607.7229baf4@highlander.home.lan> Date: Wed, 30 Dec 2009 18:18:14 +0900 In-Reply-To: <20091230095607.7229baf4@highlander.home.lan> ("Malte =?iso-8859-1?Q?Schr=F6der=22's?= message of "Wed, 30 Dec 2009 09:56:07 +0100") Message-ID: <87pr5wx1k9.fsf@devron.myhome.or.jp> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.90 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3034 Lines: 87 Malte Schr?der writes: > On Wed, 30 Dec 2009 02:36:56 +0900 > OGAWA Hirofumi wrote: > >> "Rafael J. Wysocki" writes: >> >> > This message has been generated automatically as a part of a report >> > of regressions introduced between 2.6.31 and 2.6.32. >> > >> > The following bug entry is on the current list of known regressions >> > introduced between 2.6.31 and 2.6.32. Please verify if it still should >> > be listed and let me know (either way). >> > >> > >> > Bug-Entry : http://bugzilla.kernel.org/show_bug.cgi?id=14889 >> > Subject : System wakeup by time not working anymore >> > Submitter : Malte Schr?der >> > Date : 2009-12-03 18:06 (27 days old) >> > First-Bad-Commit: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=abd6633c67925f90775bb74755f9c547e30f1f20 >> > References : http://marc.info/?l=linux-kernel&m=125986362631900&w=4 >> >> Specified commit would break the pnp driver which is using >> driver->shutdown. >> >> Could you test this (untested) patch? > > I tried to reproduce the problem, it looks like it is working now :) Thanks for testing. Andrew, could you handle this pnp breakage fix? -- OGAWA Hirofumi [PATCH] rtc_cmos: convert shutdown to new pnp_driver->shutdown commit abd6633c67925f90775bb74755f9c547e30f1f20 adds shutdown method to bus driver blindly. With it, driver->shutdown is invalid anymore. Use pnp_driver->shutdown instead. Signed-off-by: OGAWA Hirofumi --- drivers/rtc/rtc-cmos.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff -puN drivers/rtc/rtc-cmos.c~rtc-cmos-shutdown-fix drivers/rtc/rtc-cmos.c --- linux-2.6/drivers/rtc/rtc-cmos.c~rtc-cmos-shutdown-fix 2009-12-30 01:25:10.000000000 +0900 +++ linux-2.6-hirofumi/drivers/rtc/rtc-cmos.c 2009-12-30 01:27:36.000000000 +0900 @@ -1096,9 +1096,9 @@ static int cmos_pnp_resume(struct pnp_de #define cmos_pnp_resume NULL #endif -static void cmos_pnp_shutdown(struct device *pdev) +static void cmos_pnp_shutdown(struct pnp_dev *pnp) { - if (system_state == SYSTEM_POWER_OFF && !cmos_poweroff(pdev)) + if (system_state == SYSTEM_POWER_OFF && !cmos_poweroff(&pnp->dev)) return; cmos_do_shutdown(); @@ -1117,15 +1117,12 @@ static struct pnp_driver cmos_pnp_driver .id_table = rtc_ids, .probe = cmos_pnp_probe, .remove = __exit_p(cmos_pnp_remove), + .shutdown = cmos_pnp_shutdown, /* flag ensures resume() gets called, and stops syslog spam */ .flags = PNP_DRIVER_RES_DO_NOT_CHANGE, .suspend = cmos_pnp_suspend, .resume = cmos_pnp_resume, - .driver = { - .name = (char *)driver_name, - .shutdown = cmos_pnp_shutdown, - } }; #endif /* CONFIG_PNP */ _ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/