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

Commit 145b75e9 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: initialize rq->cmd_type in ide_init_drive_cmd() callers 



* Initialize rq->cmd_type in ide_wait_cmd(), ide_cmd_ioctl() and
  set_pio_mode() (other callers were aleady over-riding rq->cmd_type).

* Remove no longer needed rq->cmd_type setup from ide_init_drive_cmd().

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 2624565c

drivers/ide/ide-io.c

+0 −1
Original line number Diff line number Diff line
@@ -1672,7 +1672,6 @@ irqreturn_t ide_intr (int irq, void *dev_id) 
void ide_init_drive_cmd (struct request *rq)

{

	memset(rq, 0, sizeof(*rq));

	rq->cmd_type = REQ_TYPE_ATA_CMD;

	rq->ref_count = 1;

}

drivers/ide/ide-taskfile.c

+4 −0
Original line number Diff line number Diff line
@@ -759,6 +759,7 @@ int ide_wait_cmd (ide_drive_t *drive, u8 cmd, u8 nsect, u8 feature, u8 sectors, 
		buf = buffer;

	memset(buf, 0, 4 + SECTOR_WORDS * 4 * sectors);

	ide_init_drive_cmd(&rq);

	rq.cmd_type = REQ_TYPE_ATA_CMD;

	rq.buffer = buf;

	*buf++ = cmd;

	*buf++ = nsect;
@@ -778,7 +779,10 @@ int ide_cmd_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg) 


	if (NULL == (void *) arg) {

		struct request rq;



		ide_init_drive_cmd(&rq);

		rq.cmd_type = REQ_TYPE_ATA_CMD;



		return ide_do_drive_cmd(drive, &rq, ide_wait);

	}

drivers/ide/ide.c

+3 −0
Original line number Diff line number Diff line
@@ -878,7 +878,10 @@ int set_pio_mode(ide_drive_t *drive, int arg) 


	if (drive->special.b.set_tune)

		return -EBUSY;



	ide_init_drive_cmd(&rq);

	rq.cmd_type = REQ_TYPE_ATA_CMD;



	drive->tune_req = (u8) arg;

	drive->special.b.set_tune = 1;

	(void) ide_do_drive_cmd(drive, &rq, ide_wait);