Commit db91586b authored by Damien Le Moal's avatar Damien Le Moal
Browse files

ata: libata-scsi: Fix ata_mselect_control_ata_feature() return type 



The function ata_mselect_control_ata_feature() has a return type defined
as unsigned int but this function may return negative error codes, which
are correctly propagated up the call chain as integers.

Fix ata_mselect_control_ata_feature() to have the correct int return
type.

While at it, also fix a typo in this function description comment.

Fixes: df60f9c6 ("scsi: ata: libata: Add ATA feature control sub-page translation")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarNiklas Cassel <cassel@kernel.org>
Reviewed-by: default avatarIgor Pylypiv <ipylypiv@google.com>
parent 399eab7f

drivers/ata/libata-scsi.c

+3 −4
Original line number Diff line number Diff line
@@ -3886,12 +3886,11 @@ static int ata_mselect_control_spg0(struct ata_queued_cmd *qc, 
}



/*

 * Translate MODE SELECT control mode page, sub-pages f2h (ATA feature mode

 * Translate MODE SELECT control mode page, sub-page f2h (ATA feature mode

 * page) into a SET FEATURES command.

 */

static unsigned int ata_mselect_control_ata_feature(struct ata_queued_cmd *qc,

						    const u8 *buf, int len,

						    u16 *fp)

static int ata_mselect_control_ata_feature(struct ata_queued_cmd *qc,

					   const u8 *buf, int len, u16 *fp)

{

	struct ata_device *dev = qc->dev;

	struct ata_taskfile *tf = &qc->tf;