hal: Branch 'master'

[Dan Williams]

 fdi/information/10freedesktop/10-modem.fdi |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 54f2445df9bf20ca679449ace60091292a2bf3ab
Author: Dan Williams <dcbw at redhat.com>
Date:   Wed Mar 5 19:04:29 2008 -0500

    Fix Kyocera KPC-650 modem tags
    
    usb.interface.number=0 apparently has multiple serial devices hanging off
    it, but we only want the first serial device.  Only tag that one with modem
    and command sets.  Might be an oddity of the airprime driver, since the
    KPC-650 is the only user of airprime.

diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index cd1c5e9..a9f2f9d 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -24,8 +24,10 @@
         <!-- KPC680,KPC650/Passport, -->
         <match key="@info.parent:usb.product_id" int_outof="0x180a;0x17da">
           <match key="@info.parent:usb.interface.number" int="0">
-            <append key="info.capabilities" type="strlist">modem</append>
-            <append key="modem.command_sets" type="strlist">IS-707-A</append>
+            <match key="serial.port" int="0">
+              <append key="info.capabilities" type="strlist">modem</append>
+              <append key="modem.command_sets" type="strlist">IS-707-A</append>
+            </match>
           </match>
         </match>
       </match>