patch-2.4.17 linux/drivers/char/sonypi.c

• Lines: 24
• Date: Fri Dec 21 16:40:32 2001
• Orig file: linux-2.4.16/drivers/char/sonypi.c
• Orig date: Mon Oct 15 15:38:31 2001

diff -Naur -X /home/marcelo/lib/dontdiff linux-2.4.16/drivers/char/sonypi.c linux/drivers/char/sonypi.c
@@ -617,8 +617,11 @@
 		goto out3;
 	}
 
+#if !defined(CONFIG_ACPI)
+	/* Enable ACPI mode to get Fn key events */
 	if (fnkeyinit)
 		outb(0xf0, 0xb2);
+#endif
 
 	if (sonypi_device.model == SONYPI_DEVICE_MODEL_TYPE2)
 		sonypi_type2_srs();
@@ -666,6 +669,11 @@
 		sonypi_type2_dis();
 	else
 		sonypi_type1_dis();
+#if !defined(CONFIG_ACPI)
+	/* disable ACPI mode */
+	if (fnkeyinit)
+		outb(0xf1, 0xb2);
+#endif
 	free_irq(sonypi_device.irq, sonypi_irq);
 	release_region(sonypi_device.ioport1, sonypi_device.region_size);
 	misc_deregister(&sonypi_misc_device);