Merge branch 'devel'

[deliverable/linux.git] / drivers / scsi / qla1280.c

diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 6c6486f626ee6e823725faa5cc21a7452a3ccad7..538230be5cca1be39898aa37bffb1d220f1ddb41 100644 (file)
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -4473,17 +4473,14 @@ qla1280_exit(void)
        pci_unregister_driver(&qla1280_pci_driver);
        /* release any allocated firmware images */
        for (i = 0; i < QL_NUM_FW_IMAGES; i++) {
-               if (qla1280_fw_tbl[i].fw) {
-                       release_firmware(qla1280_fw_tbl[i].fw);
-                       qla1280_fw_tbl[i].fw = NULL;
-               }
+               release_firmware(qla1280_fw_tbl[i].fw);
+               qla1280_fw_tbl[i].fw = NULL;
        }
 }
 
 module_init(qla1280_init);
 module_exit(qla1280_exit);
 
-
 MODULE_AUTHOR("Qlogic & Jes Sorensen");
 MODULE_DESCRIPTION("Qlogic ISP SCSI (qla1x80/qla1x160) driver");
 MODULE_LICENSE("GPL");