Merge branch 'stable/fixes' of git://git.kernel.org/pub/scm/linux/ker…

…nel/git/konrad/ibft-2.6 * 'stable/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6: firmware: ibft depends on SCSI ibft: Kernel oops when rmmoding iscsi_ibft with no iBFT present.
mariux64 · Aug 14, 2010 · 5e85308 · 5e85308
2 parents 75a1e32 + 4cde752
commit 5e85308
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
@@ -133,7 +133,7 @@ config ISCSI_BOOT_SYSFS
 config ISCSI_IBFT
 	tristate "iSCSI Boot Firmware Table Attributes module"
 	select ISCSI_BOOT_SYSFS
-	depends on ISCSI_IBFT_FIND
+	depends on ISCSI_IBFT_FIND && SCSI
 	default	n
 	help
 	  This option enables support for detection and exposing of iSCSI

diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
@@ -727,8 +727,10 @@ static void ibft_unregister(void)
 
 static void ibft_cleanup(void)
 {
-	ibft_unregister();
-	iscsi_boot_destroy_kset(boot_kset);
+	if (boot_kset) {
+		ibft_unregister();
+		iscsi_boot_destroy_kset(boot_kset);
+	}
 }
 
 static void __exit ibft_exit(void)