Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (54 commits)
  [SCSI] Initial Commit of qla4xxx
  [SCSI] raid class: handle component-add errors
  [SCSI] SCSI megaraid_sas: handle thrown errors
  [SCSI] SCSI aic94xx: handle sysfs errors
  [SCSI] SCSI st: fix error handling in module init, sysfs
  [SCSI] SCSI sd: fix module init/exit error handling
  [SCSI] SCSI osst: add error handling to module init, sysfs
  [SCSI] scsi: remove hosts.h
  [SCSI] scsi: Scsi_Cmnd convertion in aic7xxx_old.c
  [SCSI] megaraid_sas: sets ioctl timeout and updates version,changelog
  [SCSI] megaraid_sas: adds tasklet for cmd completion
  [SCSI] megaraid_sas: prints pending cmds before setting hw_crit_error
  [SCSI] megaraid_sas: function pointer for disable interrupt
  [SCSI] megaraid_sas: frame count optimization
  [SCSI] megaraid_sas: FW transition and q size changes
  [SCSI] qla2xxx: Update version number to 8.01.07-k2.
  [SCSI] qla2xxx: Stall mid-layer error handlers while rport is blocked.
  [SCSI] qla2xxx: Add MODULE_FIRMWARE tags.
  [SCSI] qla2xxx: Add support for host port state FC transport attribute.
  [SCSI] qla2xxx: Add support for fabric name FC transport attribute.
  ...

2 files changed, 34 insertions, 8 deletions

diff --git a/drivers/scsi/aic94xx/Kconfig b/drivers/scsi/aic94xx/Kconfig
index 0ed391d8ee84..c83fe751d0bb 100644
--- a/drivers/scsi/aic94xx/Kconfig
+++ b/drivers/scsi/aic94xx/Kconfig
@@ -28,6 +28,7 @@ config SCSI_AIC94XX
         tristate "Adaptec AIC94xx SAS/SATA support"
         depends on PCI
         select SCSI_SAS_LIBSAS
+        select FW_LOADER
         help
                 This driver supports Adaptec's SAS/SATA 3Gb/s 64 bit PCI-X
                 AIC94xx chip based host adapters.
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
index 734adc9d5206..99743ca29ca1 100644
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -309,11 +309,29 @@ static ssize_t asd_show_dev_pcba_sn(struct device *dev,
 }
 static DEVICE_ATTR(pcba_sn, S_IRUGO, asd_show_dev_pcba_sn, NULL);
 
-static void asd_create_dev_attrs(struct asd_ha_struct *asd_ha)
+static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha)
 {
-        device_create_file(&asd_ha->pcidev->dev, &dev_attr_revision);
-        device_create_file(&asd_ha->pcidev->dev, &dev_attr_bios_build);
-        device_create_file(&asd_ha->pcidev->dev, &dev_attr_pcba_sn);
+        int err;
+
+        err = device_create_file(&asd_ha->pcidev->dev, &dev_attr_revision);
+        if (err)
+                return err;
+
+        err = device_create_file(&asd_ha->pcidev->dev, &dev_attr_bios_build);
+        if (err)
+                goto err_rev;
+
+        err = device_create_file(&asd_ha->pcidev->dev, &dev_attr_pcba_sn);
+        if (err)
+                goto err_biosb;
+
+        return 0;
+
+err_biosb:
+        device_remove_file(&asd_ha->pcidev->dev, &dev_attr_bios_build);
+err_rev:
+        device_remove_file(&asd_ha->pcidev->dev, &dev_attr_revision);
+        return err;
 }
 
 static void asd_remove_dev_attrs(struct asd_ha_struct *asd_ha)
@@ -645,7 +663,9 @@ static int __devinit asd_pci_probe(struct pci_dev *dev,
         }
         ASD_DPRINTK("escbs posted\n");
 
-        asd_create_dev_attrs(asd_ha);
+        err = asd_create_dev_attrs(asd_ha);
+        if (err)
+                goto Err_dev_attrs;
 
         err = asd_register_sas_ha(asd_ha);
         if (err)
@@ -668,6 +688,7 @@ Err_en_phys:
         asd_unregister_sas_ha(asd_ha);
 Err_reg_sas:
         asd_remove_dev_attrs(asd_ha);
+Err_dev_attrs:
 Err_escbs:
         asd_disable_ints(asd_ha);
         free_irq(dev->irq, asd_ha);
@@ -754,9 +775,9 @@ static ssize_t asd_version_show(struct device_driver *driver, char *buf)
 }
 static DRIVER_ATTR(version, S_IRUGO, asd_version_show, NULL);
 
-static void asd_create_driver_attrs(struct device_driver *driver)
+static int asd_create_driver_attrs(struct device_driver *driver)
 {
-        driver_create_file(driver, &driver_attr_version);
+        return driver_create_file(driver, &driver_attr_version);
 }
 
 static void asd_remove_driver_attrs(struct device_driver *driver)
@@ -834,10 +855,14 @@ static int __init aic94xx_init(void)
         if (err)
                 goto out_release_transport;
 
-        asd_create_driver_attrs(&aic94xx_pci_driver.driver);
+        err = asd_create_driver_attrs(&aic94xx_pci_driver.driver);
+        if (err)
+                goto out_unregister_pcidrv;
 
         return err;
 
+ out_unregister_pcidrv:
+        pci_unregister_driver(&aic94xx_pci_driver);
  out_release_transport:
         sas_release_transport(aic94xx_transport_template);
  out_destroy_caches: