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

Commit 55437989 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide 

Pull IDE update from David Miller:
 "Two small IDE layer adjustments"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  drivers: ide: Fix mostly harmless off-by-one hardcoded value
  IDE: Deletion of an unnecessary check before the function call "module_put"
parents a7e8ddd8 ca957b6a

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 */

drivers/ide/ide.c

+1 −2
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ void ide_device_put(ide_drive_t *drive) 
	struct device *host_dev = drive->hwif->host->dev[0];

	struct module *module = host_dev ? host_dev->driver->owner : NULL;



	if (module)

	module_put(module);

#endif

	put_device(&drive->gendev);