sata_via: restore vt*_prepare_host error handling

PATCH Applied Marcin Slusarz 3 participants 3 messages Nov 2, 2008 – Nov 4, 2008 libata

Share & tools

Marcin Slusarz

author

2008-11-02 21:19 UTC #0 lore raw

PATCH 1/1 sata_via: restore vt*_prepare_host error handling

commit b9d5b89b487517cbd4cb4702da829e07ef9e4432 (sata_via: fix support for 5287) accidently (?) removed vt*_prepare_host error handling - restore it

catched by gcc:
drivers/ata/sata_via.c: In function 'svia_init_one':
drivers/ata/sata_via.c:567: warning: 'host' may be used uninitialized in this function

Signed-off-by Marcin Slusarz <[email protected]>

Cc Tejun Heo <[email protected]>

Cc Joseph Chan <[email protected]>

Cc Jeff Garzik <[email protected]>

---
 drivers/ata/sata_via.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

drivers/ata/sata_via.c +3 -1

index 62367fe..c18935f 100644
@@ -602,8 +602,10 @@ static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 		rc = vt8251_prepare_host(pdev, &host);
 		break;
 	default:
-		return -EINVAL;
+		rc = -EINVAL;
 	}
+	if (rc)
+		return rc;
 
 	svia_configure(pdev);

Signature · 1 line

1.5.6.4

Tejun Heo

Acked-by on v1 1/1

2008-11-03 02:47 UTC #1 lore raw

Quoted 11 lines · Marcin Slusarz

commit b9d5b89b487517cbd4cb4702da829e07ef9e4432 (sata_via: fix support for 5287) accidently (?) removed vt*_prepare_host error handling - restore it
catched by gcc:
drivers/ata/sata_via.c: In function 'svia_init_one':
drivers/ata/sata_via.c:567: warning: 'host' may be used uninitialized in this function
Signed-off-by Marcin Slusarz <[email protected]>
Cc Tejun Heo <[email protected]>
Cc Joseph Chan <[email protected]>
Cc Jeff Garzik <[email protected]>

Acked-by Tejun Heo <[email protected]>

Thank you.

Signature · 1 line

tejun

Jeff Garzik

Applied

2008-11-04 06:10 UTC #2 lore raw

In reply to Marcin Slusarz

Quoted 20 lines · Marcin Slusarz

commit b9d5b89b487517cbd4cb4702da829e07ef9e4432 (sata_via: fix support for 5287) accidently (?) removed vt*_prepare_host error handling - restore it
catched by gcc:
drivers/ata/sata_via.c: In function 'svia_init_one':
drivers/ata/sata_via.c:567: warning: 'host' may be used uninitialized in this function
Signed-off-by Marcin Slusarz <[email protected]>
Cc Tejun Heo <[email protected]>
Cc Joseph Chan <[email protected]>
Cc Jeff Garzik <[email protected]>
---
 drivers/ata/sata_via.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/ata/sata_via.c +0 -0
index 62367fe..c18935f 100644

drivers/ata/sata_via.c static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) · line 608

Quoted 8 lines

drivers/ata/sata_via.c +3 -1

@@ -602,8 +602,10 @@ static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 		rc = vt8251_prepare_host(pdev, &host);
 		break;
 	default:
-		return -EINVAL;
+		rc = -EINVAL;
 	}
+	if (rc)
+		return rc;

applied