Signed-off-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
Cc: "James E.J. Bottomley" <James.Bottomley@xxxxxxx>
Cc: linux-scsi@xxxxxxxxxxxxxxx
---
drivers/scsi/libsas/sas_scsi_host.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index f0cfba9..527dcf7 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -1078,14 +1078,10 @@ void sas_target_destroy(struct scsi_target *starget)
static void sas_parse_addr(u8 *sas_addr, const char *p)
{
int i;
- for (i = 0; i < SAS_ADDR_SIZE; i++) {
+ for (i = 0; i < SAS_ADDR_SIZE && *p; i++) {
u8 h, l;
- if (!*p)
- break;
- h = isdigit(*p) ? *p-'0' : toupper(*p)-'A'+10;
- p++;
- l = isdigit(*p) ? *p-'0' : toupper(*p)-'A'+10;
- p++;
+ h = hex_to_bin(*p++);
+ l = hex_to_bin(*p++);
sas_addr[i] = (h<<4) | l;
}
}
--
1.7.2.2
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
