aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/aty/radeon_base.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 400e9264e456..3c0a03f69d83 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -2161,6 +2161,7 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,
2161 struct radeonfb_info *rinfo; 2161 struct radeonfb_info *rinfo;
2162 int ret; 2162 int ret;
2163 unsigned char c1, c2; 2163 unsigned char c1, c2;
2164 int err = 0;
2164 2165
2165 pr_debug("radeonfb_pci_register BEGIN\n"); 2166 pr_debug("radeonfb_pci_register BEGIN\n");
2166 2167
@@ -2340,9 +2341,14 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,
2340 2341
2341 /* Register some sysfs stuff (should be done better) */ 2342 /* Register some sysfs stuff (should be done better) */
2342 if (rinfo->mon1_EDID) 2343 if (rinfo->mon1_EDID)
2343 sysfs_create_bin_file(&rinfo->pdev->dev.kobj, &edid1_attr); 2344 err |= sysfs_create_bin_file(&rinfo->pdev->dev.kobj,
2345 &edid1_attr);
2344 if (rinfo->mon2_EDID) 2346 if (rinfo->mon2_EDID)
2345 sysfs_create_bin_file(&rinfo->pdev->dev.kobj, &edid2_attr); 2347 err |= sysfs_create_bin_file(&rinfo->pdev->dev.kobj,
2348 &edid2_attr);
2349 if (err)
2350 pr_warning("%s() Creating sysfs files failed, continuing\n",
2351 __func__);
2346 2352
2347 /* save current mode regs before we switch into the new one 2353 /* save current mode regs before we switch into the new one
2348 * so we can restore this upon __exit 2354 * so we can restore this upon __exit