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

Commit d0887c43 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Tejun Heo
Browse files

libata-zpodd: must use ata_tf_init() 



There are  some SATA controllers which have both devices 0 and 1 but this module
just zeroes out taskfile and sets then ATA_TFLAG_DEVICE (not sure that's needed)
which could  lead to a wrong device being selected just before issuing command.
Thus we should  call ata_tf_init()  which sets  up the device register value
properly, like  all other users of ata_exec_internal() do...

Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: stable@vger.kernel.org
parent 78062c50

drivers/ata/libata-zpodd.c

+4 −3
Original line number Diff line number Diff line
@@ -32,13 +32,14 @@ struct zpodd { 


static int eject_tray(struct ata_device *dev)

{

	struct ata_taskfile tf = {};

	struct ata_taskfile tf;

	const char cdb[] = {  GPCMD_START_STOP_UNIT,

		0, 0, 0,

		0x02,     /* LoEj */

		0, 0, 0, 0, 0, 0, 0,

	};



	ata_tf_init(dev, &tf);

	tf.flags = ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;

	tf.command = ATA_CMD_PACKET;

	tf.protocol = ATAPI_PROT_NODATA;
@@ -52,8 +53,7 @@ static enum odd_mech_type zpodd_get_mech_type(struct ata_device *dev) 
	char buf[16];

	unsigned int ret;

	struct rm_feature_desc *desc = (void *)(buf + 8);

	struct ata_taskfile tf = {};



	struct ata_taskfile tf;

	char cdb[] = {  GPCMD_GET_CONFIGURATION,

			2,      /* only 1 feature descriptor requested */

			0, 3,   /* 3, removable medium feature */
@@ -62,6 +62,7 @@ static enum odd_mech_type zpodd_get_mech_type(struct ata_device *dev) 
			0, 0, 0,

	};



	ata_tf_init(dev, &tf);

	tf.flags = ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;

	tf.command = ATA_CMD_PACKET;

	tf.protocol = ATAPI_PROT_PIO;