[systemd-commits] 2 commits - hwdb/20-pci-vendor-product.hwdb src/udev

[Kay Sievers]

 hwdb/20-pci-vendor-product.hwdb  |   38 ++++++++++++++++++++++++++++++++++----
 src/udev/udev-builtin-firmware.c |    3 +++
 2 files changed, 37 insertions(+), 4 deletions(-)

New commits:
commit 4641b09cbf455f0f4ed54dee028345553be4f711
Author: Kay Sievers <kay at vrfy.org>
Date:   Fri Nov 16 17:08:20 2012 +0100

    hwdb: update

diff --git a/hwdb/20-pci-vendor-product.hwdb b/hwdb/20-pci-vendor-product.hwdb
index eb842b8..d4455f0 100644
--- a/hwdb/20-pci-vendor-product.hwdb
+++ b/hwdb/20-pci-vendor-product.hwdb
@@ -5612,6 +5612,9 @@ pci:v00001002d00009901*
 pci:v00001002d00009902*
  ID_PRODUCT_FROM_DATABASE=Trinity HDMI Audio Controller
 
+pci:v00001002d00009904*
+ ID_PRODUCT_FROM_DATABASE=Trinity [Radeon HD 7560D]
+
 pci:v00001002d00009990*
  ID_PRODUCT_FROM_DATABASE=Trinity [Radeon HD 7520G]
 
@@ -21714,7 +21717,7 @@ pci:v000010DEd00001245*
  ID_PRODUCT_FROM_DATABASE=GF116 [GeForce GTS 450]
 
 pci:v000010DEd00001247*
- ID_PRODUCT_FROM_DATABASE=GF106 [GeForce GT 555M]
+ ID_PRODUCT_FROM_DATABASE=GF116 [GeForce GT 555M]
 
 pci:v000010DEd00001249*
  ID_PRODUCT_FROM_DATABASE=GF116 [GeForce GTS 450]
@@ -48248,9 +48251,33 @@ pci:v00008086d00000C7E*
 pci:v00008086d00000C7F*
  ID_PRODUCT_FROM_DATABASE=Centerton Internal Fabric
 
+pci:v00008086d00000D00*
+ ID_PRODUCT_FROM_DATABASE=Crystal Well DRAM Controller
+
+pci:v00008086d00000D01*
+ ID_PRODUCT_FROM_DATABASE=Crystal Well PCI Express x16 Controller
+
+pci:v00008086d00000D04*
+ ID_PRODUCT_FROM_DATABASE=Crystal Well DRAM Controller
+
+pci:v00008086d00000D05*
+ ID_PRODUCT_FROM_DATABASE=Crystal Well PCI Express x8 Controller
+
+pci:v00008086d00000D09*
+ ID_PRODUCT_FROM_DATABASE=Crystal Well PCI Express x4 Controller
+
 pci:v00008086d00000D0C*
  ID_PRODUCT_FROM_DATABASE=Crystal Well HD Audio Controller
 
+pci:v00008086d00000D16*
+ ID_PRODUCT_FROM_DATABASE=Crystal Well Integrated Graphics Controller
+
+pci:v00008086d00000D26*
+ ID_PRODUCT_FROM_DATABASE=Crystal Well Integrated Graphics Controller
+
+pci:v00008086d00000D36*
+ ID_PRODUCT_FROM_DATABASE=Crystal Well Integrated Graphics Controller
+
 pci:v00008086d00000E00*
  ID_PRODUCT_FROM_DATABASE=Ivytown DMI2
 
@@ -50973,7 +51000,7 @@ pci:v00008086d00001521sv0000103Csd00003380*
  ID_PRODUCT_FROM_DATABASE=Ethernet 1Gb 4-port 366i Adapter
 
 pci:v00008086d00001521sv0000103Csd0000339E*
- ID_PRODUCT_FROM_DATABASE=Ethernet 1Gb 2-port 361T Adapter [Wharton Stony Lake]
+ ID_PRODUCT_FROM_DATABASE=Ethernet 1Gb 2-port 361T Adapter
 
 pci:v00008086d00001521sv0000108Esd00007B16*
  ID_PRODUCT_FROM_DATABASE=Quad Port GbE PCIe 2.0 ExpressModule, UTP
@@ -51030,13 +51057,13 @@ pci:v00008086d00001523*
  ID_PRODUCT_FROM_DATABASE=I350 Gigabit Backplane Connection
 
 pci:v00008086d00001523sv0000103Csd00001784*
- ID_PRODUCT_FROM_DATABASE=Ethernet 1Gb 2-port 361FLB Adapter [Badger Flat]
+ ID_PRODUCT_FROM_DATABASE=Ethernet 1Gb 2-port 361FLB Adapter
 
 pci:v00008086d00001523sv0000103Csd000018D1*
  ID_PRODUCT_FROM_DATABASE=Ethernet 1Gb 2-port 361FLB Adapter
 
 pci:v00008086d00001523sv0000103Csd0000339F*
- ID_PRODUCT_FROM_DATABASE=Ethernet 1Gb 4-port 366M Adapter [Vaca Key]
+ ID_PRODUCT_FROM_DATABASE=Ethernet 1Gb 4-port 366M Adapter
 
 pci:v00008086d00001523sv00008086sd00001F52*
  ID_PRODUCT_FROM_DATABASE=1GbE 4P I350 Mezz
@@ -51068,6 +51095,9 @@ pci:v00008086d00001527sv00008086sd00000002*
 pci:v00008086d00001528*
  ID_PRODUCT_FROM_DATABASE=Ethernet Controller 10-Gigabit X540-AT2
 
+pci:v00008086d00001528sv00001028sd00001F61*
+ ID_PRODUCT_FROM_DATABASE=Ethernet 10G 4P X540/I350 rNDC
+
 pci:v00008086d00001528sv0000103Csd0000192D*
  ID_PRODUCT_FROM_DATABASE=561FLR-T 2-port 10Gb Ethernet Adapter
 

commit 5bb633f13aff7f507ed494a51c7b9e4ca5e4377c
Author: Umut Tezduyar <umut at tezduyar.com>
Date:   Fri Nov 16 17:07:19 2012 +0100

    udev: firmware - disable firmware loading when firmware file is 0 byte
    
    If firmware file is not found in the file system, udev
    terminates firmware loading. This is not the case if
    firmware file exists in the file system but doesn't have
    any data in it.

diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c
index 2fb75a7..4a91d33 100644
--- a/src/udev/udev-builtin-firmware.c
+++ b/src/udev/udev-builtin-firmware.c
@@ -140,9 +140,12 @@ static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], boo
         }
 
         if (stat(fwpath, &statbuf) < 0 || statbuf.st_size == 0) {
+                if (!in_initrd())
+                        set_loading(udev, loadpath, "-1");
                 rc = EXIT_FAILURE;
                 goto exit;
         }
+
         if (unlink(misspath) == 0)
                 util_delete_path(udev, misspath);