From: Shérab Date: Sat, 16 Jul 2011 13:30:49 +0000 (+1000) Subject: There was one code block that I commented to be able to test the patch dnd X-Git-Tag: next-20110726~2^2~82 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b1d5d6a3fc255c073f2a566a3d8e1df8b9f50f30;p=karo-tx-linux.git 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 --- 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");