diff options
| author |   Damien Le Moal <dlemoal@kernel.org> | 2025-04-18 15:40:14 +0900 |
|---|---|---|
| committer | Damien Le Moal <dlemoal@kernel.org> | 2025-04-22 16:05:14 +0900 |
| commit | db91586b1e8f36122a9e5b8fbced11741488dd22 (patch) | |
| tree | fb178ab08b201e73c42acb5e2f124266df8e462f | |
| parent | ata: libata-sata: Save all fields from sense data descriptor (diff) | |
| download | wireguard-linux-db91586b1e8f36122a9e5b8fbced11741488dd22.tar.xz wireguard-linux-db91586b1e8f36122a9e5b8fbced11741488dd22.zip | |
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: df60f9c64576 ("scsi: ata: libata: Add ATA feature control sub-page translation")
Cc: stable@vger.kernel.org
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Niklas Cassel <cassel@kernel.org>
Reviewed-by: Igor Pylypiv <ipylypiv@google.com>
| -rw-r--r-- | drivers/ata/libata-scsi.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 2796c0da8257..24e662c837e3 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -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; |