From a8d4c05dc717ef09a59a53703effc5459740144a Mon Sep 17 00:00:00 2001
From: Elias Oltmanns <eo@nebensachen.de>
Date: Wed, 30 Jul 2008 12:32:39 -0700
Subject: [PATCH] --- yaml --- r: 107471 b: refs/heads/master c:
 49ea3b04971ece6a5efe5d7b763ad9d2f169d441 h: refs/heads/master i:   107469:
 9b1f62a24f9ec3af535950b6ed716e910914fe5a   107467:
 c114404a38b2812f6191ccb4288d3a6ccf157f0c   107463:
 dbab147e614ae120c3595bff34eb2b5b572b9ad5   107455:
 4fc8f40f357eb8ad0e137f2e59570fc306771046 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/ata/libata-core.c | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 5f0161d7a440..30bfe78a2a61 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2486fa561a3192bbbec39c7feef87a1e07bd6342
+refs/heads/master: 49ea3b04971ece6a5efe5d7b763ad9d2f169d441
diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c
index 9cd04f684102..f69d1548b562 100644
--- a/trunk/drivers/ata/libata-core.c
+++ b/trunk/drivers/ata/libata-core.c
@@ -6098,16 +6098,20 @@ static int __init ata_init(void)
 
 	ata_wq = create_workqueue("ata");
 	if (!ata_wq)
-		return -ENOMEM;
+		goto free_force_tbl;
 
 	ata_aux_wq = create_singlethread_workqueue("ata_aux");
-	if (!ata_aux_wq) {
-		destroy_workqueue(ata_wq);
-		return -ENOMEM;
-	}
+	if (!ata_aux_wq)
+		goto free_wq;
 
 	printk(KERN_DEBUG "libata version " DRV_VERSION " loaded.\n");
 	return 0;
+
+free_wq:
+	destroy_workqueue(ata_wq);
+free_force_tbl:
+	kfree(ata_force_tbl);
+	return -ENOMEM;
 }
 
 static void __exit ata_exit(void)