1 files changed, 38 insertions, 16 deletions

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 7098dfb07449..a04498d390c8 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -52,27 +52,49 @@ EXPORT_SYMBOL(no_pci_devices);
  * Some platforms allow access to legacy I/O port and ISA memory space on
  * a per-bus basis.  This routine creates the files and ties them into
  * their associated read, write and mmap files from pci-sysfs.c
+ *
+ * On error unwind, but don't propogate the error to the caller
+ * as it is ok to set up the PCI bus without these files.
  */
 static void pci_create_legacy_files(struct pci_bus *b)
 {
+        int error;
+
         b->legacy_io = kzalloc(sizeof(struct bin_attribute) * 2,
                                GFP_ATOMIC);
-        if (b->legacy_io) {
-                b->legacy_io->attr.name = "legacy_io";
-                b->legacy_io->size = 0xffff;
-                b->legacy_io->attr.mode = S_IRUSR | S_IWUSR;
-                b->legacy_io->read = pci_read_legacy_io;
-                b->legacy_io->write = pci_write_legacy_io;
-                device_create_bin_file(&b->dev, b->legacy_io);
-
-                /* Allocated above after the legacy_io struct */
-                b->legacy_mem = b->legacy_io + 1;
-                b->legacy_mem->attr.name = "legacy_mem";
-                b->legacy_mem->size = 1024*1024;
-                b->legacy_mem->attr.mode = S_IRUSR | S_IWUSR;
-                b->legacy_mem->mmap = pci_mmap_legacy_mem;
-                device_create_bin_file(&b->dev, b->legacy_mem);
-        }
+        if (!b->legacy_io)
+                goto kzalloc_err;
+
+        b->legacy_io->attr.name = "legacy_io";
+        b->legacy_io->size = 0xffff;
+        b->legacy_io->attr.mode = S_IRUSR | S_IWUSR;
+        b->legacy_io->read = pci_read_legacy_io;
+        b->legacy_io->write = pci_write_legacy_io;
+        error = device_create_bin_file(&b->dev, b->legacy_io);
+        if (error)
+                goto legacy_io_err;
+
+        /* Allocated above after the legacy_io struct */
+        b->legacy_mem = b->legacy_io + 1;
+        b->legacy_mem->attr.name = "legacy_mem";
+        b->legacy_mem->size = 1024*1024;
+        b->legacy_mem->attr.mode = S_IRUSR | S_IWUSR;
+        b->legacy_mem->mmap = pci_mmap_legacy_mem;
+        error = device_create_bin_file(&b->dev, b->legacy_mem);
+        if (error)
+                goto legacy_mem_err;
+
+        return;
+
+legacy_mem_err:
+        device_remove_bin_file(&b->dev, b->legacy_io);
+legacy_io_err:
+        kfree(b->legacy_io);
+        b->legacy_io = NULL;
+kzalloc_err:
+        printk(KERN_WARNING "pci: warning: could not create legacy I/O port "
+               "and ISA memory resources to sysfs\n");
+        return;
 }
 
 void pci_remove_legacy_files(struct pci_bus *b)