Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[android-x86/kernel.git] / drivers / scsi / libsas / sas_scsi_host.c

diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index c940685..6de9681 100644 (file)
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -27,6 +27,7 @@
 #include <linux/firmware.h>
 #include <linux/export.h>
 #include <linux/ctype.h>
+#include <linux/kernel.h>
 
 #include "sas_internal.h"
 
@@ -959,21 +960,6 @@ void sas_target_destroy(struct scsi_target *starget)
        sas_put_device(found_dev);
 }
 
-static void sas_parse_addr(u8 *sas_addr, const char *p)
-{
-       int i;
-       for (i = 0; i < SAS_ADDR_SIZE; 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++;
-               sas_addr[i] = (h<<4) | l;
-       }
-}
-
 #define SAS_STRING_ADDR_SIZE   16
 
 int sas_request_addr(struct Scsi_Host *shost, u8 *addr)
@@ -990,7 +976,9 @@ int sas_request_addr(struct Scsi_Host *shost, u8 *addr)
                goto out;
        }
 
-       sas_parse_addr(addr, fw->data);
+       res = hex2bin(addr, fw->data, strnlen(fw->data, SAS_ADDR_SIZE * 2) / 2);
+       if (res)
+               goto out;
 
 out:
        release_firmware(fw);