2006-12-19 22:59:33

by Ben Collins

[permalink] [raw]
Subject: [PATCH 2.6.20-git] sata_svw: Check for errors from ata_device_add()

Without this patch, G5 oopses on boot. I've had this in Ubuntu since
2.6.17, but I forgot it was in there. Still required with 2.6.20.

Signed-off-by: Ben Collins <[email protected]>

diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index d89c959..85911b4 100644
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -473,11 +473,11 @@ static int k2_sata_init_one (struct pci_

pci_set_master(pdev);

- /* FIXME: check ata_device_add return value */
- ata_device_add(probe_ent);
- kfree(probe_ent);
+ if (ata_device_add(probe_ent))
+ return 0;

- return 0;
+ /* Failed to add, no device present */
+ rc = -ENODEV;

err_out_free_ent:
kfree(probe_ent);


2006-12-19 23:34:04

by Ben Collins

[permalink] [raw]
Subject: Re: [PATCH 2.6.20-git] sata_svw: Check for errors from ata_device_add()

On Tue, 2006-12-19 at 17:59 -0500, Ben Collins wrote:
> Without this patch, G5 oopses on boot. I've had this in Ubuntu since
> 2.6.17, but I forgot it was in there. Still required with 2.6.20.
>
> Signed-off-by: Ben Collins <[email protected]>

Ignore this patch for now, BenH and I are discussing the issue further.