2.6.18-rc5-mm1 ich_pata_cbl_detect returns a value despite being void

[Frederik Deweerdt]

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.

Regards,
Frederik

Signed-off-by: Frederik Deweerdt <deweerdt@xxxxxxx>
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index e4d7873..c9c8341 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -608,8 +608,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++;
 	}
 

-- 
VGER BF report: U 0.500037
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/