Merge branch 'stable/for-linus-5.1' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Mar 2019 17:50:14 +0000 (09:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Mar 2019 17:50:14 +0000 (09:50 -0800)
Pull ibft updates from Konrad Rzeszutek Wilk:
 "Two tiny fixes - a missing break, and upgrading the subsystem to use
  modern macros"

* 'stable/for-linus-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft:
  iscsi_ibft: use virt_to_phys instead of isa_virt_to_bus
  iscsi_ibft: Fix missing break in switch statement

drivers/firmware/iscsi_ibft.c
drivers/firmware/iscsi_ibft_find.c

index 6bc8e6640d713eb890feb37b95083b1303f364a5..c51462f5aa1e4f52d01cb7c88db42bdc006f7767 100644 (file)
@@ -542,6 +542,7 @@ static umode_t __init ibft_check_tgt_for(void *data, int type)
        case ISCSI_BOOT_TGT_NIC_ASSOC:
        case ISCSI_BOOT_TGT_CHAP_TYPE:
                rc = S_IRUGO;
+               break;
        case ISCSI_BOOT_TGT_NAME:
                if (tgt->tgt_name_len)
                        rc = S_IRUGO;
index 72d9ea18270b572102cc622ac15dc3ec1cfa0127..85c656d04bb0f545caeaf8213b773c0be97739ee 100644 (file)
@@ -104,7 +104,7 @@ unsigned long __init find_ibft_region(unsigned long *sizep)
 
        if (ibft_addr) {
                *sizep = PAGE_ALIGN(ibft_addr->header.length);
-               return (u64)isa_virt_to_bus(ibft_addr);
+               return (u64)virt_to_phys(ibft_addr);
        }
 
        *sizep = 0;