Commit 5e853081 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'stable/fixes' of git://git.kernel.org/pub/scm/linux/kernel/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.
parents 75a1e32c 4cde7525

drivers/firmware/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/firmware/iscsi_ibft.c

+4 −2
Original line number Diff line number Diff line
@@ -727,9 +727,11 @@ static void ibft_unregister(void) 


static void ibft_cleanup(void)

{

	if (boot_kset) {

		ibft_unregister();

		iscsi_boot_destroy_kset(boot_kset);

	}

}



static void __exit ibft_exit(void)

{