1 files changed, 4 insertions, 14 deletions

diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index ff767755e98b..9e1eb473c0a1 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -349,23 +349,13 @@ static u32 hpt37x_find_mode(struct ata_port *ap, int speed)
 
 static int hpt_dma_blacklisted(const struct ata_device *dev, char *modestr, const char *list[])
 {
-        unsigned char model_num[ATA_ID_PROD_LEN];
-        char *s;
-        unsigned int len;
+        unsigned char model_num[ATA_ID_PROD_LEN + 1];
         int i = 0;
 
-        ata_id_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num));
-        s = &model_num[0];
-        len = strnlen(s, sizeof(model_num));
+        ata_id_c_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num));
 
-        /* ATAPI specifies that empty space is blank-filled; remove blanks */
-        while ((len > 0) && (s[len - 1] == ' ')) {
-                len--;
-                s[len] = 0;
-        }
-
-        while(list[i] != NULL) {
-                if (!strncmp(list[i], s, len)) {
+        while (list[i] != NULL) {
+                if (!strcmp(list[i], model_num)) {
                         printk(KERN_WARNING DRV_NAME ": %s is not supported for %s.\n",
                                 modestr, list[i]);
                         return 1;