The patch titled
arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver-fix-2
has been added to the -mm tree. Its filename is
arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver-fix-2.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver-fix-2
From: Shérab <Sebastien.Hinderer@xxxxxxxxxxxx>
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@xxxxxxxxxx>
Cc: Matthew Garrett <mjg@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/platform/iris/iris.c | 6 ++++++
1 file changed, 6 insertions(+)
diff -puN arch/x86/platform/iris/iris.c~arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver-fix-2 arch/x86/platform/iris/iris.c
--- a/arch/x86/platform/iris/iris.c~arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver-fix-2
+++ a/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");
_
Patches currently in -mm which might be from Sebastien.Hinderer@xxxxxxxxxxxx are
arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch
arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver-fix.patch
arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver-fix-2.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
