diff options
Diffstat (limited to 'drivers/net/ehea')
-rw-r--r-- | drivers/net/ehea/ehea.h | 4 | ||||
-rw-r--r-- | drivers/net/ehea/ehea_phyp.c | 2 | ||||
-rw-r--r-- | drivers/net/ehea/ehea_qmr.c | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h index e01926b7b5b7..5524271eedca 100644 --- a/drivers/net/ehea/ehea.h +++ b/drivers/net/ehea/ehea.h | |||
@@ -40,13 +40,13 @@ | |||
40 | #include <asm/io.h> | 40 | #include <asm/io.h> |
41 | 41 | ||
42 | #define DRV_NAME "ehea" | 42 | #define DRV_NAME "ehea" |
43 | #define DRV_VERSION "EHEA_0092" | 43 | #define DRV_VERSION "EHEA_0093" |
44 | 44 | ||
45 | /* eHEA capability flags */ | 45 | /* eHEA capability flags */ |
46 | #define DLPAR_PORT_ADD_REM 1 | 46 | #define DLPAR_PORT_ADD_REM 1 |
47 | #define DLPAR_MEM_ADD 2 | 47 | #define DLPAR_MEM_ADD 2 |
48 | #define DLPAR_MEM_REM 4 | 48 | #define DLPAR_MEM_REM 4 |
49 | #define EHEA_CAPABILITIES (DLPAR_PORT_ADD_REM | DLPAR_MEM_ADD) | 49 | #define EHEA_CAPABILITIES (DLPAR_PORT_ADD_REM | DLPAR_MEM_ADD | DLPAR_MEM_REM) |
50 | 50 | ||
51 | #define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \ | 51 | #define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \ |
52 | | NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR) | 52 | | NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR) |
diff --git a/drivers/net/ehea/ehea_phyp.c b/drivers/net/ehea/ehea_phyp.c index 156eb6320b4e..2a33a613d9e6 100644 --- a/drivers/net/ehea/ehea_phyp.c +++ b/drivers/net/ehea/ehea_phyp.c | |||
@@ -535,7 +535,7 @@ u64 ehea_h_query_ehea(const u64 adapter_handle, void *cb_addr) | |||
535 | cb_logaddr, /* R5 */ | 535 | cb_logaddr, /* R5 */ |
536 | 0, 0, 0, 0, 0); /* R6-R10 */ | 536 | 0, 0, 0, 0, 0); /* R6-R10 */ |
537 | #ifdef DEBUG | 537 | #ifdef DEBUG |
538 | ehea_dmp(cb_addr, sizeof(struct hcp_query_ehea), "hcp_query_ehea"); | 538 | ehea_dump(cb_addr, sizeof(struct hcp_query_ehea), "hcp_query_ehea"); |
539 | #endif | 539 | #endif |
540 | return hret; | 540 | return hret; |
541 | } | 541 | } |
diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ehea/ehea_qmr.c index 140f05baafd8..db8a9257e680 100644 --- a/drivers/net/ehea/ehea_qmr.c +++ b/drivers/net/ehea/ehea_qmr.c | |||
@@ -595,7 +595,8 @@ static int ehea_create_busmap_callback(unsigned long pfn, | |||
595 | end_section = start_section + ((nr_pages * PAGE_SIZE) / EHEA_SECTSIZE); | 595 | end_section = start_section + ((nr_pages * PAGE_SIZE) / EHEA_SECTSIZE); |
596 | mr_len = *(unsigned long *)arg; | 596 | mr_len = *(unsigned long *)arg; |
597 | 597 | ||
598 | ehea_bmap = kzalloc(sizeof(struct ehea_bmap), GFP_KERNEL); | 598 | if (!ehea_bmap) |
599 | ehea_bmap = kzalloc(sizeof(struct ehea_bmap), GFP_KERNEL); | ||
599 | if (!ehea_bmap) | 600 | if (!ehea_bmap) |
600 | return -ENOMEM; | 601 | return -ENOMEM; |
601 | 602 | ||