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 <lenb@kernel.org>
Cc: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/x86/platform/iris/iris.c b/arch/x86/platform/iris/iris.c
index e22a01f692bed45de3d1f46562bd11454de88d65..f1900223aca7e003a48d474f9808a7add8def92a 100644 (file)
--- 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");