Merge tag 'integrity-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar...

[linux-2.6-microblaze.git] / drivers / scsi / ipr.c

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 30c30a1..5d78f7e 100644 (file)
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -1300,7 +1300,7 @@ static char *__ipr_format_res_path(u8 *res_path, char *buffer, int len)
 
        *p = '\0';
        p += scnprintf(p, buffer + len - p, "%02X", res_path[0]);
-       for (i = 1; res_path[i] != 0xff && ((i * 3) < len); i++)
+       for (i = 1; res_path[i] != 0xff && i < IPR_RES_PATH_BYTES; i++)
                p += scnprintf(p, buffer + len - p, "-%02X", res_path[i]);
 
        return buffer;
@@ -1323,7 +1323,7 @@ static char *ipr_format_res_path(struct ipr_ioa_cfg *ioa_cfg,
 
        *p = '\0';
        p += scnprintf(p, buffer + len - p, "%d/", ioa_cfg->host->host_no);
-       __ipr_format_res_path(res_path, p, len - (buffer - p));
+       __ipr_format_res_path(res_path, p, len - (p - buffer));
        return buffer;
 }