On Sat, 2010-09-11 at 16:38 +0300, Andy Shevchenko wrote: > 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++); the hex_to_bin() is really to prevent open coded mistakes. When the open coding pre-dates the hex_to_bin macro, I'm inclined to leave it alone unless it contains an actual bug. James -- 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