From d649a75c2b0a5a5a8c4404948df8d6ad50d7ab68 Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Wed, 23 Jul 2008 21:31:16 -0700 Subject: [PATCH] --- yaml --- r: 105527 b: refs/heads/master c: fcea8030b3c2e71ad89f080901c63a04f07881c8 h: refs/heads/master i: 105525: 7066ecbf2209ca148f59726eb3ce590feba01381 105523: 6bc3cedfb12fc77d5cabcb3d5f4a1e7784cd1161 105519: 8b3cc4cd20877683fdeec037b6288162ac2b1a59 v: v3 --- [refs] | 2 +- trunk/drivers/video/aty/radeon_base.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5498d32b4b49..cea11f182bfc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7951ac91c7d45b61f54f1cdabc24b52b40785de6 +refs/heads/master: fcea8030b3c2e71ad89f080901c63a04f07881c8 diff --git a/trunk/drivers/video/aty/radeon_base.c b/trunk/drivers/video/aty/radeon_base.c index 400e9264e456..3c0a03f69d83 100644 --- a/trunk/drivers/video/aty/radeon_base.c +++ b/trunk/drivers/video/aty/radeon_base.c @@ -2161,6 +2161,7 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev, struct radeonfb_info *rinfo; int ret; unsigned char c1, c2; + int err = 0; pr_debug("radeonfb_pci_register BEGIN\n"); @@ -2340,9 +2341,14 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev, /* Register some sysfs stuff (should be done better) */ if (rinfo->mon1_EDID) - sysfs_create_bin_file(&rinfo->pdev->dev.kobj, &edid1_attr); + err |= sysfs_create_bin_file(&rinfo->pdev->dev.kobj, + &edid1_attr); if (rinfo->mon2_EDID) - sysfs_create_bin_file(&rinfo->pdev->dev.kobj, &edid2_attr); + err |= sysfs_create_bin_file(&rinfo->pdev->dev.kobj, + &edid2_attr); + if (err) + pr_warning("%s() Creating sysfs files failed, continuing\n", + __func__); /* save current mode regs before we switch into the new one * so we can restore this upon __exit