The patch titled
ich_pata_cbl_detect returns a value despite being void
has been removed from the -mm tree. Its filename is
libata-add-40pin-short-cable-support-honour-drive-fix.patch
This patch was dropped because it was folded into libata-add-40pin-short-cable-support-honour-drive.patch
------------------------------------------------------
Subject: ich_pata_cbl_detect returns a value despite being void
From: Frederik Deweerdt <deweerdt@xxxxxxx>
Hi,
Compiling 2.6.18-rc5-mm1 issues the following warning:
CC drivers/ata/ata_piix.o
drivers/ata/ata_piix.c: In function 'ich_pata_cbl_detect':
drivers/ata/ata_piix.c:612: warning: 'return' with a value, in
function returning void
This was introduced by the
libata-add-40pin-short-cable-support-honour-drive.patch.
The attached patch fixes the issue by assigning ap->cbl.
Signed-off-by: Frederik Deweerdt <deweerdt@xxxxxxx>
Acked-by: Alan Cox <alan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ata/ata_piix.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff -puN drivers/ata/ata_piix.c~libata-add-40pin-short-cable-support-honour-drive-fix drivers/ata/ata_piix.c
--- a/drivers/ata/ata_piix.c~libata-add-40pin-short-cable-support-honour-drive-fix
+++ a/drivers/ata/ata_piix.c
@@ -640,8 +640,10 @@ static void ich_pata_cbl_detect(struct a
while (lap->device) {
if (lap->device == pdev->device &&
lap->subvendor == pdev->subsystem_vendor &&
- lap->subdevice == pdev->subsystem_device)
- return ATA_CBL_PATA40_SHORT;
+ lap->subdevice == pdev->subsystem_device) {
+ ap->cbl = ATA_CBL_PATA40_SHORT;
+ return;
+ }
lap++;
}
_
Patches currently in -mm which might be from deweerdt@xxxxxxx are
git-drm.patch
libata-add-40pin-short-cable-support-honour-drive.patch
libata-add-40pin-short-cable-support-honour-drive-fix.patch
bluetooth-use-gfp_atomic-in-_sock_creates-sk_alloc.patch
fix-mem_write-return-value.patch
add-missing-page_copy-export-for-ppc-and-powerpc.patch
pr_debug-check-pr_debug-arguments-arm-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
