Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca957b6a authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by David S. Miller
Browse files

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: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1746fbe5

drivers/ide/ide-floppy.c

+2 −2
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ static void ide_floppy_setup(ide_drive_t *drive) 
	 * it. It should be fixed as of version 1.9, but to be on the safe side

	 * we'll leave the limitation below for the 2.2.x tree.

	 */

	if (!strncmp((char *)&id[ATA_ID_PROD], "IOMEGA ZIP 100 ATAPI", 20)) {

	if (strstarts((char *)&id[ATA_ID_PROD], "IOMEGA ZIP 100 ATAPI")) {

		drive->atapi_flags |= IDE_AFLAG_ZIP_DRIVE;

		/* This value will be visible in the /proc/ide/hdx/settings */

		drive->pc_delay = IDEFLOPPY_PC_DELAY;
@@ -498,7 +498,7 @@ static void ide_floppy_setup(ide_drive_t *drive) 
	 * Guess what? The IOMEGA Clik! drive also needs the above fix. It makes

	 * nasty clicking noises without it, so please don't remove this.

	 */

	if (strncmp((char *)&id[ATA_ID_PROD], "IOMEGA Clik!", 11) == 0) {

	if (strstarts((char *)&id[ATA_ID_PROD], "IOMEGA Clik!")) {

		blk_queue_max_hw_sectors(drive->queue, 64);

		drive->atapi_flags |= IDE_AFLAG_CLIK_DRIVE;

		/* IOMEGA Clik! drives do not support lock/unlock commands */