From a7c2a545af4d7f631975b0915023fb4cc6fd46ea Mon Sep 17 00:00:00 2001
From: Mike Christie <michaelc@cs.wisc.edu>
Date: Fri, 24 Jun 2011 15:11:52 -0500
Subject: [PATCH] --- yaml --- r: 257835 b: refs/heads/master c:
 9d04516310aaef3970c642a54531a52123001178 h: refs/heads/master i:   257833:
 556ff0f17c129c11a04c74a6a15349689d9d4121   257831:
 3663ed5d6ac28ae77198ab2b57cf3633fb1e8f5d v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/scsi/be2iscsi/be_main.c | 6 ++----
 trunk/drivers/scsi/iscsi_boot_sysfs.c | 3 +++
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b0b30f1fe078..17f4928c3f7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c682d602d0f9751c92e07c196be27d8fac6ec3ed
+refs/heads/master: 9d04516310aaef3970c642a54531a52123001178
diff --git a/trunk/drivers/scsi/be2iscsi/be_main.c b/trunk/drivers/scsi/be2iscsi/be_main.c
index 7b967ed48962..2e214390c63b 100644
--- a/trunk/drivers/scsi/be2iscsi/be_main.c
+++ b/trunk/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/trunk/drivers/scsi/iscsi_boot_sysfs.c b/trunk/drivers/scsi/iscsi_boot_sysfs.c
index df6bff7366cf..4274ce93d8f2 100644
--- a/trunk/drivers/scsi/iscsi_boot_sysfs.c
+++ b/trunk/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);