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

Commit 5a4f13fa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
  ide: memory overrun in ide_get_identity_ioctl() on big endian machines using ioctl HDIO_OBSOLETE_IDENTITY
  ide: fix resume for CONFIG_BLK_DEV_IDEACPI=y
  ide-cd: handle fragmented packet commands gracefully
  ide: always kill the whole request on error
  ide: fix ide_kill_rq() for special ide-{floppy,tape} driver requests
parents ec9c45d4 e18ed145

drivers/ide/ide-acpi.c

+7 −30
Original line number Diff line number Diff line
@@ -92,6 +92,11 @@ int ide_acpi_init(void) 
	return 0;

}



bool ide_port_acpi(ide_hwif_t *hwif)

{

	return ide_noacpi == 0 && hwif->acpidata;

}



/**

 * ide_get_dev_handle - finds acpi_handle and PCI device.function

 * @dev: device to locate
@@ -352,9 +357,6 @@ int ide_acpi_exec_tfs(ide_drive_t *drive) 
	unsigned long	gtf_address;

	unsigned long	obj_loc;



	if (ide_noacpi)

		return 0;



	DEBPRINT("call get_GTF, drive=%s port=%d\n", drive->name, drive->dn);



	ret = do_drive_get_GTF(drive, &gtf_length, &gtf_address, &obj_loc);
@@ -389,16 +391,6 @@ void ide_acpi_get_timing(ide_hwif_t *hwif) 
	struct acpi_buffer	output;

	union acpi_object 	*out_obj;



	if (ide_noacpi)

		return;



	DEBPRINT("ENTER:\n");



	if (!hwif->acpidata) {

		DEBPRINT("no ACPI data for %s\n", hwif->name);

		return;

	}



	/* Setting up output buffer for _GTM */

	output.length = ACPI_ALLOCATE_BUFFER;

	output.pointer = NULL;	/* ACPI-CA sets this; save/free it later */
@@ -479,16 +471,6 @@ void ide_acpi_push_timing(ide_hwif_t *hwif) 
	struct ide_acpi_drive_link	*master = &hwif->acpidata->master;

	struct ide_acpi_drive_link	*slave = &hwif->acpidata->slave;



	if (ide_noacpi)

		return;



	DEBPRINT("ENTER:\n");



	if (!hwif->acpidata) {

		DEBPRINT("no ACPI data for %s\n", hwif->name);

		return;

	}



	/* Give the GTM buffer + drive Identify data to the channel via the

	 * _STM method: */

	/* setup input parameters buffer for _STM */
@@ -527,16 +509,11 @@ void ide_acpi_set_state(ide_hwif_t *hwif, int on) 
	ide_drive_t *drive;

	int i;



	if (ide_noacpi || ide_noacpi_psx)

	if (ide_noacpi_psx)

		return;



	DEBPRINT("ENTER:\n");



	if (!hwif->acpidata) {

		DEBPRINT("no ACPI data for %s\n", hwif->name);

		return;

	}



	/* channel first and then drives for power on and verse versa for power off */

	if (on)

		acpi_bus_set_power(hwif->acpidata->obj_handle, ACPI_STATE_D0);
@@ -616,7 +593,7 @@ void ide_acpi_port_init_devices(ide_hwif_t *hwif) 
				 drive->name, err);

	}



	if (!ide_acpionboot) {

	if (ide_noacpi || ide_acpionboot == 0) {

		DEBPRINT("ACPI methods disabled on boot\n");

		return;

	}

drivers/ide/ide-cd.c

+12 −2
Original line number Diff line number Diff line
@@ -592,9 +592,19 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) 
			}

		} else if (!blk_pc_request(rq)) {

			ide_cd_request_sense_fixup(drive, cmd);

			/* complain if we still have data left to transfer */



			uptodate = cmd->nleft ? 0 : 1;

			if (uptodate == 0)



			/*

			 * suck out the remaining bytes from the drive in an

			 * attempt to complete the data xfer. (see BZ#13399)

			 */

			if (!(stat & ATA_ERR) && !uptodate && thislen) {

				ide_pio_bytes(drive, cmd, write, thislen);

				uptodate = cmd->nleft ? 0 : 1;

			}



			if (!uptodate)

				rq->cmd_flags |= REQ_FAILED;

		}

		goto out_end;

drivers/ide/ide-devsets.c

+1 −1
Original line number Diff line number Diff line
@@ -183,6 +183,6 @@ ide_startstop_t ide_do_devset(ide_drive_t *drive, struct request *rq) 
	err = setfunc(drive, *(int *)&rq->cmd[1]);

	if (err)

		rq->errors = err;

	ide_complete_rq(drive, err, ide_rq_bytes(rq));

	ide_complete_rq(drive, err, blk_rq_bytes(rq));

	return ide_stopped;

}

drivers/ide/ide-eh.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static inline void ide_complete_drive_reset(ide_drive_t *drive, int err) 
	if (rq && blk_special_request(rq) && rq->cmd[0] == REQ_DRIVE_RESET) {

		if (err <= 0 && rq->errors == 0)

			rq->errors = -EIO;

		ide_complete_rq(drive, err ? err : 0, ide_rq_bytes(rq));

		ide_complete_rq(drive, err ? err : 0, blk_rq_bytes(rq));

	}

}

drivers/ide/ide-floppy.c

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive, 
	drive->failed_pc = NULL;

	if (blk_fs_request(rq) == 0 && rq->errors == 0)

		rq->errors = -EIO;

	ide_complete_rq(drive, -EIO, ide_rq_bytes(rq));

	ide_complete_rq(drive, -EIO, blk_rq_bytes(rq));

	return ide_stopped;

}