Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 564e7411 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'stable/for-linus-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft 

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
parents e4ff63b4 8bd04c57

drivers/firmware/iscsi_ibft.c

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

drivers/firmware/iscsi_ibft_find.c

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