Merge ath-next from ath.git

[linux-2.6-block.git] / drivers / coresight / coresight.c

diff --git a/drivers/coresight/coresight.c b/drivers/coresight/coresight.c
index 6e0181f844258113358cbfc7988cdabd1bb58774..c5def93823570d72b5962be46e07c5a89c1ac892 100644 (file)
--- a/drivers/coresight/coresight.c
+++ b/drivers/coresight/coresight.c
@@ -498,17 +498,18 @@ static int coresight_orphan_match(struct device *dev, void *data)
         * Circle throuch all the connection of that component.  If we find
         * an orphan connection whose name matches @csdev, link it.
         */
-       for (i = 0; i < i_csdev->nr_outport; i++)       {
+       for (i = 0; i < i_csdev->nr_outport; i++) {
                conn = &i_csdev->conns[i];
 
                /* We have found at least one orphan connection */
                if (conn->child_dev == NULL) {
                        /* Does it match this newly added device? */
-                       if (!strcmp(dev_name(&csdev->dev), conn->child_name))
+                       if (!strcmp(dev_name(&csdev->dev), conn->child_name)) {
                                conn->child_dev = csdev;
-               } else {
-                       /* Too bad, this component still has an orphan */
-                       still_orphan = true;
+                       } else {
+                               /* This component still has an orphan */
+                               still_orphan = true;
+                       }
                }
        }