[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Werner Almesberger]

The following commit has been merged in the andy-tracking branch:
commit 5c7e3aef519168ab5230466f51f28b8553cbd363
Author: Werner Almesberger <werner at openmoko.org>
Date:   Mon Mar 30 21:06:02 2009 -0300

    Fix ar6000_do_activate return value
    
    ... and check the return value in ar6000_activate.
    
    [ Werner: changed ___FUNCTION__ to __func__ ]
    
    Signed-off-by: Michael Trimarchi <michael at panicking.kicks-ass.org>
    Signed-off-by: Werner Almesberger <werner at openmoko.org>

diff --git a/drivers/ar6000/hif/hif2.c b/drivers/ar6000/hif/hif2.c
index 571833f..8d0755f 100644
--- a/drivers/ar6000/hif/hif2.c
+++ b/drivers/ar6000/hif/hif2.c
@@ -508,7 +508,8 @@ static int ar6000_do_activate(struct hif_device *hif)
 	sdio_release_host(func);
 
 	hif->io_task = kthread_run(io, hif, "ar6000_io");
-	if (IS_ERR(hif->io_task)) {
+	ret = IS_ERR(hif->io_task);
+	if (ret) {
 		dev_err(dev, "kthread_run(ar6000_io): %d\n", ret);
 		goto out_func_ready;
 	}
@@ -580,8 +581,14 @@ static int ar6000_activate(struct hif_device *hif)
 	mutex_lock(&hif->activate_lock);
 	if (!hif->active) {
 		ret = ar6000_do_activate(hif);
+		if (ret) {
+			printk(KERN_ERR "%s: Failed to activate %d\n",
+				__func__, ret);
+			goto out;
+		}
 		hif->active = 1;
 	}
+out:
 	mutex_unlock(&hif->activate_lock);
 	return ret;
 }

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko