Merge tag 'isci-for-3.6' into for-next

isci update for 3.6

1/ Fix the workaround for drives that have a slow response to COMSAS.
   Drives with this problem intermittently take a long time to be
   identified, or fail to be identified altogether.

2/ A minor fix for the efi variable code failure path

3/ A handful of smatch fixups from Dan Carpenter

diff --combined drivers/scsi/isci/init.c
index 92c1d86d1fc6478471cd88a318bd9e72e9bd65d6,8870bd3b6383cb08c130431829aa926abeaca38d..1286a8a787e2bcf39a82387b3b723d33a5544d6c
--- 1/drivers/scsi/isci/init.c
--- 2/drivers/scsi/isci/init.c
+++ b/drivers/scsi/isci/init.c
@@@ -166,9 -166,6 +166,9 @@@ static struct scsi_host_template isci_s
        .sg_tablesize                   = SG_ALL,
        .max_sectors                    = SCSI_DEFAULT_MAX_SECTORS,
        .use_clustering                 = ENABLE_CLUSTERING,
 +      .eh_abort_handler               = sas_eh_abort_handler,
 +      .eh_device_reset_handler        = sas_eh_device_reset_handler,
 +      .eh_bus_reset_handler           = sas_eh_bus_reset_handler,
        .target_destroy                 = sas_target_destroy,
        .ioctl                          = sas_ioctl,
        .shost_attrs                    = isci_host_attrs,
@@@ -644,7 -641,6 +644,6 @@@ static int __devinit isci_pci_probe(str
                                                orom->hdr.version)) {
                        dev_warn(&pdev->dev,
                                 "[%d]: invalid oem parameters detected, falling back to firmware\n", i);
-                       devm_kfree(&pdev->dev, orom);
                        orom = NULL;
                        break;
                }