diff options
author | Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2014-11-27 16:57:29 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-12-12 15:26:31 -0500 |
commit | ca957b6a34a6f7014828f235e35c1945cb955795 (patch) | |
tree | 3b215cd6d91bed62f19736b90e7806951c42f3f2 /drivers/ide | |
parent | 1746fbe5656b1b10064913b9293a4590ec0b7f27 (diff) |
drivers: ide: Fix mostly harmless off-by-one hardcoded value
The string "IOMEGA Clik!" has length 12, not 11. Using strstarts
avoids the error-prone hardcoding of the prefix length. For
consistency, also change the occurence just above.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-floppy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 3d42043fec51..8c6363cdd208 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
@@ -487,7 +487,7 @@ static void ide_floppy_setup(ide_drive_t *drive) | |||
487 | * it. It should be fixed as of version 1.9, but to be on the safe side | 487 | * it. It should be fixed as of version 1.9, but to be on the safe side |
488 | * we'll leave the limitation below for the 2.2.x tree. | 488 | * we'll leave the limitation below for the 2.2.x tree. |
489 | */ | 489 | */ |
490 | if (!strncmp((char *)&id[ATA_ID_PROD], "IOMEGA ZIP 100 ATAPI", 20)) { | 490 | if (strstarts((char *)&id[ATA_ID_PROD], "IOMEGA ZIP 100 ATAPI")) { |
491 | drive->atapi_flags |= IDE_AFLAG_ZIP_DRIVE; | 491 | drive->atapi_flags |= IDE_AFLAG_ZIP_DRIVE; |
492 | /* This value will be visible in the /proc/ide/hdx/settings */ | 492 | /* This value will be visible in the /proc/ide/hdx/settings */ |
493 | drive->pc_delay = IDEFLOPPY_PC_DELAY; | 493 | drive->pc_delay = IDEFLOPPY_PC_DELAY; |
@@ -498,7 +498,7 @@ static void ide_floppy_setup(ide_drive_t *drive) | |||
498 | * Guess what? The IOMEGA Clik! drive also needs the above fix. It makes | 498 | * Guess what? The IOMEGA Clik! drive also needs the above fix. It makes |
499 | * nasty clicking noises without it, so please don't remove this. | 499 | * nasty clicking noises without it, so please don't remove this. |
500 | */ | 500 | */ |
501 | if (strncmp((char *)&id[ATA_ID_PROD], "IOMEGA Clik!", 11) == 0) { | 501 | if (strstarts((char *)&id[ATA_ID_PROD], "IOMEGA Clik!")) { |
502 | blk_queue_max_hw_sectors(drive->queue, 64); | 502 | blk_queue_max_hw_sectors(drive->queue, 64); |
503 | drive->atapi_flags |= IDE_AFLAG_CLIK_DRIVE; | 503 | drive->atapi_flags |= IDE_AFLAG_CLIK_DRIVE; |
504 | /* IOMEGA Clik! drives do not support lock/unlock commands */ | 504 | /* IOMEGA Clik! drives do not support lock/unlock commands */ |