samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
commit db91586b1e8f36122a9e5b8fbced11741488dd22 upstream.

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: df60f9c645 ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Damien Le Moal
2025-04-18 15:40:14 +09:00
committed by Greg Kroah-Hartman
parent f92d5d7134
commit f0a1b05487
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/ata/libata-scsi.c
View File

@@ -3764,12 +3764,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. * page) into a SET FEATURES command.
*/ */
static unsigned int ata_mselect_control_ata_feature(struct ata_queued_cmd *qc, static int ata_mselect_control_ata_feature(struct ata_queued_cmd *qc,
const u8 *buf, int len, const u8 *buf, int len, u16 *fp)
u16 *fp)
{ {
struct ata_device *dev = qc->dev; struct ata_device *dev = qc->dev;
struct ata_taskfile *tf = &qc->tf; struct ata_taskfile *tf = &qc->tf;