diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 03:06:15 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 03:06:15 +0200 |
| commit | 5e8530810805858892959b8ebbcec1009ea8c12d (patch) | |
| tree | 01c08d865f43b51ec6b4201082d5b84218192fe9 /drivers/firmware | |
| parent | Merge git://git.infradead.org/~dwmw2/ideapad-2.6 (diff) | |
| parent | firmware: ibft depends on SCSI (diff) | |
| download | linux-5e8530810805858892959b8ebbcec1009ea8c12d.tar.xz linux-5e8530810805858892959b8ebbcec1009ea8c12d.zip | |
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.
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/firmware/iscsi_ibft.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index a6c670b8ce52..d4ed8e98edf7 100644 --- 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 index 4f04ec0410a0..6148a1c67895 100644 --- 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) |