From: 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. Signed-off-by: Frederik Deweerdt Acked-by: Alan Cox Signed-off-by: Andrew Morton --- 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++; } _