Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 121738
b: refs/heads/master
c: c5916cf
h: refs/heads/master
v: v3
  • Loading branch information
Hannes Hering authored and Jeff Garzik committed Nov 6, 2008
1 parent ea9eccd commit 7322dcc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 739bb23d722313e37322f485eb65f700b060d817
refs/heads/master: c5916cf8dbd3ac5ec675d9347aeaa796b546b50e
2 changes: 1 addition & 1 deletion trunk/drivers/net/ehea/ehea.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include <asm/io.h>

#define DRV_NAME "ehea"
#define DRV_VERSION "EHEA_0095"
#define DRV_VERSION "EHEA_0096"

/* eHEA capability flags */
#define DLPAR_PORT_ADD_REM 1
Expand Down
10 changes: 5 additions & 5 deletions trunk/drivers/net/ehea/ehea_qmr.c
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ static int ehea_update_busmap(unsigned long pfn, unsigned long nr_pages, int add
int top = ehea_calc_index(i, EHEA_TOP_INDEX_SHIFT);
int dir = ehea_calc_index(i, EHEA_DIR_INDEX_SHIFT);
int idx = i & EHEA_INDEX_MASK;

if (add) {
int ret = ehea_init_bmap(ehea_bmap, top, dir);
if (ret)
Expand Down Expand Up @@ -780,7 +780,7 @@ void ehea_destroy_busmap(void)

kfree(ehea_bmap);
ehea_bmap = NULL;
out_destroy:
out_destroy:
mutex_unlock(&ehea_busmap_mutex);
}

Expand Down Expand Up @@ -858,10 +858,10 @@ static u64 ehea_reg_mr_sections(int top, int dir, u64 *pt,
for (idx = 0; idx < EHEA_MAP_ENTRIES; idx++) {
if (!ehea_bmap->top[top]->dir[dir]->ent[idx])
continue;

hret = ehea_reg_mr_section(top, dir, idx, pt, adapter, mr);
if ((hret != H_SUCCESS) && (hret != H_PAGE_REGISTERED))
return hret;
return hret;
}
return hret;
}
Expand All @@ -879,7 +879,7 @@ static u64 ehea_reg_mr_dir_sections(int top, u64 *pt,

hret = ehea_reg_mr_sections(top, dir, pt, adapter, mr);
if ((hret != H_SUCCESS) && (hret != H_PAGE_REGISTERED))
return hret;
return hret;
}
return hret;
}
Expand Down

0 comments on commit 7322dcc

Please sign in to comment.