]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix queue-4.4/scsi-qla2xxx-fix-the-endianness-of-the-qla82xx_get_fw_size-return-type...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 9 Feb 2020 17:41:10 +0000 (18:41 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 9 Feb 2020 17:41:10 +0000 (18:41 +0100)
queue-4.4/scsi-qla2xxx-fix-the-endianness-of-the-qla82xx_get_fw_size-return-type.patch

index 0d9555b302fb30b7de897f49d8ab2a2c6e554986..22e59200211bfbcb989493921595900bfec8c8bd 100644 (file)
@@ -25,12 +25,20 @@ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- drivers/scsi/qla2xxx/qla_nx.c |    +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
+ drivers/scsi/qla2xxx/qla_nx.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 --- a/drivers/scsi/qla2xxx/qla_nx.c
 +++ b/drivers/scsi/qla2xxx/qla_nx.c
-@@ -1600,8 +1600,7 @@ qla82xx_get_bootld_offset(struct qla_hw_
+@@ -10,6 +10,7 @@
+ #include <linux/ratelimit.h>
+ #include <linux/vmalloc.h>
+ #include <scsi/scsi_tcq.h>
++#include <asm/unaligned.h>
+ #define MASK(n)                       ((1ULL<<(n))-1)
+ #define MN_WIN(addr) (((addr & 0x1fc0000) >> 1) | \
+@@ -1600,8 +1601,7 @@ qla82xx_get_bootld_offset(struct qla_hw_
        return (u8 *)&ha->hablob->fw->data[offset];
  }
  
@@ -40,7 +48,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  {
        struct qla82xx_uri_data_desc *uri_desc = NULL;
  
-@@ -1612,7 +1611,7 @@ qla82xx_get_fw_size(struct qla_hw_data *
+@@ -1612,7 +1612,7 @@ qla82xx_get_fw_size(struct qla_hw_data *
                        return cpu_to_le32(uri_desc->size);
        }
  
@@ -49,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  }
  
  static u8 *
-@@ -1803,7 +1802,7 @@ qla82xx_fw_load_from_blob(struct qla_hw_
+@@ -1803,7 +1803,7 @@ qla82xx_fw_load_from_blob(struct qla_hw_
        }
  
        flashaddr = FLASH_ADDR_START;