Merge branch 'akpm-current/current'

[karo-tx-linux.git] / drivers / staging / rdma / ipath / ipath_file_ops.c

diff --git a/drivers/staging/rdma/ipath/ipath_file_ops.c b/drivers/staging/rdma/ipath/ipath_file_ops.c
index c11f6c58ce534df07c91f01c57a2ddbb8f1ba1f2..13c3cd11ab92a5c610ef7a5e32795a0b0a0931c9 100644 (file)
--- a/drivers/staging/rdma/ipath/ipath_file_ops.c
+++ b/drivers/staging/rdma/ipath/ipath_file_ops.c
@@ -825,13 +825,13 @@ static void ipath_clean_part_key(struct ipath_portdata *pd,
                                ipath_stats.sps_pkeys[j] =
                                        dd->ipath_pkeys[j] = 0;
                                pchanged++;
+                       } else {
+                               ipath_cdbg(VERBOSE, "p%u key %x matches #%d, "
+                                          "but ref still %d\n", pd->port_port,
+                                          pd->port_pkeys[i], j,
+                                          atomic_read(&dd->ipath_pkeyrefs[j]));
+                               break;
                        }
-                       else ipath_cdbg(
-                               VERBOSE, "p%u key %x matches #%d, "
-                               "but ref still %d\n", pd->port_port,
-                               pd->port_pkeys[i], j,
-                               atomic_read(&dd->ipath_pkeyrefs[j]));
-                       break;
                }
                pd->port_pkeys[i] = 0;
        }
@@ -2046,7 +2046,6 @@ static void unlock_expected_tids(struct ipath_portdata *pd)
 
 static int ipath_close(struct inode *in, struct file *fp)
 {
-       int ret = 0;
        struct ipath_filedata *fd;
        struct ipath_portdata *pd;
        struct ipath_devdata *dd;
@@ -2158,7 +2157,7 @@ static int ipath_close(struct inode *in, struct file *fp)
 
 bail:
        kfree(fd);
-       return ret;
+       return 0;
 }
 
 static int ipath_port_info(struct ipath_portdata *pd, u16 subport,