2 files changed, 12 insertions, 7 deletions

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 3b28e8728131..df9a12c8b373 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -1671,7 +1671,7 @@ static void ipr_log_enhanced_array_error(struct ipr_ioa_cfg *ioa_cfg,
 
         array_entry = error->array_member;
         num_entries = min_t(u32, be32_to_cpu(error->num_entries),
-                            sizeof(error->array_member));
+                            ARRAY_SIZE(error->array_member));
 
         for (i = 0; i < num_entries; i++, array_entry++) {
                 if (!memcmp(array_entry->vpd.vpd.sn, zero_sn, IPR_SERIAL_NUM_LEN))
@@ -2152,8 +2152,8 @@ static void ipr_log_sis64_array_error(struct ipr_ioa_cfg *ioa_cfg,
         ipr_err_separator;
 
         array_entry = error->array_member;
-        num_entries = min_t(u32, be32_to_cpu(error->num_entries),
-                            sizeof(error->array_member));
+        num_entries = min_t(u32, error->num_entries,
+                            ARRAY_SIZE(error->array_member));
 
         for (i = 0; i < num_entries; i++, array_entry++) {
 
@@ -2167,10 +2167,10 @@ static void ipr_log_sis64_array_error(struct ipr_ioa_cfg *ioa_cfg,
 
                 ipr_err("Array Member %d:\n", i);
                 ipr_log_ext_vpd(&array_entry->vpd);
-                ipr_err("Current Location: %s",
+                ipr_err("Current Location: %s\n",
                          ipr_format_res_path(array_entry->res_path, buffer,
                                              sizeof(buffer)));
-                ipr_err("Expected Location: %s",
+                ipr_err("Expected Location: %s\n",
                          ipr_format_res_path(array_entry->expected_res_path,
                                              buffer, sizeof(buffer)));
 
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index 67cae67378ad..aa8bb2f2c6ee 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -319,6 +319,11 @@ struct ipr_ext_vpd {
         __be32 wwid[2];
 }__attribute__((packed));
 
+struct ipr_ext_vpd64 {
+        struct ipr_vpd vpd;
+        __be32 wwid[4];
+}__attribute__((packed));
+
 struct ipr_std_inq_data {
         u8 peri_qual_dev_type;
 #define IPR_STD_INQ_PERI_QUAL(peri) ((peri) >> 5)
@@ -395,7 +400,7 @@ struct ipr_config_table_entry64 {
         __be64 res_path;
         struct ipr_std_inq_data std_inq_data;
         u8 reserved2[4];
-        __be64 reserved3[2]; // description text
+        __be64 reserved3[2];
         u8 reserved4[8];
 }__attribute__ ((packed, aligned (8)));
 
@@ -914,7 +919,7 @@ struct ipr_hostrcb_type_24_error {
         u8 array_id;
         u8 last_res_path[8];
         u8 protection_level[8];
-        struct ipr_ext_vpd array_vpd;
+        struct ipr_ext_vpd64 array_vpd;
         u8 description[16];
         u8 reserved2[3];
         u8 num_entries;