diff options
| author | Mike Christie <michaelc@cs.wisc.edu> | 2011-06-24 15:11:52 -0500 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2011-06-29 16:43:03 -0500 |
| commit | 9d04516310aaef3970c642a54531a52123001178 (patch) | |
| tree | 2e1948a93a6a136ebfc9f1ad08b6ab4d200b05cc /drivers/scsi | |
| parent | c682d602d0f9751c92e07c196be27d8fac6ec3ed (diff) | |
[SCSI] iscsi_boot_sysfs: have this module check for null on destruction
This moves the check for NULL boot_sets to the iscsi_boot_sysfs
module instead of having the drivers do it.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/be2iscsi/be_main.c | 6 | ||||
| -rw-r--r-- | drivers/scsi/iscsi_boot_sysfs.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index 7b967ed48962..2e214390c63b 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c @@ -420,8 +420,7 @@ static int beiscsi_setup_boot_info(struct beiscsi_hba *phba) return 0; free_kset: - if (phba->boot_kset) - iscsi_boot_destroy_kset(phba->boot_kset); + iscsi_boot_destroy_kset(phba->boot_kset); return -ENOMEM; } @@ -4149,8 +4148,7 @@ static void beiscsi_remove(struct pci_dev *pcidev) phba->ctrl.mbox_mem_alloced.size, phba->ctrl.mbox_mem_alloced.va, phba->ctrl.mbox_mem_alloced.dma); - if (phba->boot_kset) - iscsi_boot_destroy_kset(phba->boot_kset); + iscsi_boot_destroy_kset(phba->boot_kset); iscsi_host_remove(phba->shost); pci_dev_put(phba->pcidev); iscsi_host_free(phba->shost); diff --git a/drivers/scsi/iscsi_boot_sysfs.c b/drivers/scsi/iscsi_boot_sysfs.c index df6bff7366cf..4274ce93d8f2 100644 --- a/drivers/scsi/iscsi_boot_sysfs.c +++ b/drivers/scsi/iscsi_boot_sysfs.c @@ -472,6 +472,9 @@ void iscsi_boot_destroy_kset(struct iscsi_boot_kset *boot_kset) { struct iscsi_boot_kobj *boot_kobj, *tmp_kobj; + if (!boot_kset) + return; + list_for_each_entry_safe(boot_kobj, tmp_kobj, &boot_kset->kobj_list, list) iscsi_boot_remove_kobj(boot_kobj); |