rpms/kernel/FC-4 linux-2.6-i8k-dmi.patch, NONE, 1.1 kernel-2.6.spec, 1.1491, 1.1492

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv3391

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-i8k-dmi.patch 
Log Message:
Fix up DMI usage in i8k driver.



linux-2.6-i8k-dmi.patch:
 i8k.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-i8k-dmi.patch ---

On Thursday 03 November 2005 23:41, Al Viro wrote:
> On Thu, Nov 03, 2005 at 11:19:02PM -0500, Dave Jones wrote:
> > The missing '?' field is puzzling though. Looking at the diff,
> > this should work.  Is this a shortfalling of seq_file perhaps ?
> 
> dmi_get_system_info() returns "" instead of "?" now, apparently...
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
> 

Oops! I have that field in my BIOS so I never noticed the problem...

I wonder if something like the patch below will fix it.

-- 
Dmitry

Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
---

 drivers/char/i8k.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

Index: work/drivers/char/i8k.c
===================================================================
--- work.orig/drivers/char/i8k.c
+++ work/drivers/char/i8k.c
@@ -99,7 +99,9 @@ struct smm_regs {
 
 static inline char *i8k_get_dmi_data(int field)
 {
-	return dmi_get_system_info(field) ? : "N/A";
+	char *dmi_data = dmi_get_system_info(field);
+
+	return dmi_data && *dmi_data ? dmi_data : "?";
 }
 
 /*



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1491
retrieving revision 1.1492
diff -u -r1.1491 -r1.1492
--- kernel-2.6.spec	5 Nov 2005 07:36:09 -0000	1.1491
+++ kernel-2.6.spec	5 Nov 2005 18:58:17 -0000	1.1492
@@ -338,6 +338,7 @@
 Patch1760: linux-2.6-kauditd-suspend.patch
 Patch1761: linux-2.6-firmware-timeout.patch
 Patch1762: linux-2.6-suspend-mxcsr.patch
+Patch1763: linux-2.6-i8k-dmi.patch
 
 # ACPI patches.
 Patch1800: linux-2.6-acpi-enable-ecburst.patch
@@ -768,6 +769,8 @@
 %patch1761 -p1
 # Fix FPU corruption on return from S3
 %patch1762 -p1
+# Fix up DMI usage in i8k driver.
+%patch1763 -p1
 
 # ACPI patches.
 # Enable EC burst
@@ -1225,6 +1228,7 @@
 %changelog
 * Sat Nov  5 2005 Dave Jones <davej at redhat.com>
 - Fix FPU corruption on return from S3. (#140257)
+- Fix up DMI usage in i8k driver.
 
 * Sat Nov  5 2005 Dave Jones <davej at redhat.com> [2.6.14-1.1636_FC4]
 - Increase firmware loader timeout.