From b1d5d6a3fc255c073f2a566a3d8e1df8b9f50f30 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sh=C3=A9rab?= Date: Sat, 16 Jul 2011 23:30:49 +1000 Subject: [PATCH] There was one code block that I commented to be able to test the patch dnd then forgot to uncomment again, and then you removed it but it should actually have been uncommented rather than removed. So here is the patch tat corrects the code, to be applied on top of your own patch. Cc: Len Brown Cc: Matthew Garrett Signed-off-by: Andrew Morton --- arch/x86/platform/iris/iris.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/x86/platform/iris/iris.c b/arch/x86/platform/iris/iris.c index e22a01f692be..f1900223aca7 100644 --- a/arch/x86/platform/iris/iris.c +++ b/arch/x86/platform/iris/iris.c @@ -65,6 +65,12 @@ static void iris_power_off(void) */ static int iris_probe(struct platform_device *pdev) { + unsigned char status = inb(IRIS_GIO_INPUT); + if (status == IRIS_GIO_NODEV) { + printk(KERN_ERR "This machine does not seem to be an Iris. " + "Power off handler not installed.\n"); + return -ENODEV; + } old_pm_power_off = pm_power_off; pm_power_off = &iris_power_off; printk(KERN_INFO "Iris power_off handler installed.\n"); -- 2.39.5