[PATCH]: Too wide match for quirk none in 20-video-quirk-pm-lenovo.fdi

[Terje Røsten]

The test for power_management.quirk.none true in 
20-video-quirk-pm-lenovo.fdi is too wide.

I need the following patch to get resume from pm-suspend to work.

My laptop has system.hardware.product prefix 7664, however it's has 
system.hardware.version
ThinkPad T61, not ThinkPad T60.


diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi 
b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index c565b9e..10a147b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -54,7 +54,14 @@
       </match>
 
       <!-- These Thinkpads don't need a quirk: 6459 (T61p), 7664 (T60) 
see s2ram -->
-      <match key="system.hardware.product" prefix_outof="6459;7664;8918">
+      <match key="system.hardware.version" prefix="ThinkPad ">
+    <match key="system.hardware.version" suffix="T60">
+      <match key="system.hardware.product" prefix_outof="7664">
+            <merge key="power_management.quirk.none" 
type="bool">true</merge>
+      </match>
+    </match>
+      </match>
+      <match key="system.hardware.product" prefix_outof="6459;8918">
         <merge key="power_management.quirk.none" type="bool">true</merge>
       </match>
 

Patch and lshal -lu /org/freedesktop/Hal/devices/computer output are 
attached.


 - Terje

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: too-wide-match-quirk.none-video-lenovo.patch
Url: http://lists.freedesktop.org/archives/hal/attachments/20081226/d5f84a7c/attachment.ksh 
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: lshal-computer
Url: http://lists.freedesktop.org/archives/hal/attachments/20081226/d5f84a7c/attachment.asc