diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-24 16:09:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-24 16:09:13 -0700 |
| commit | 152cbcf94baec68b45832db5024184906ab798b1 (patch) | |
| tree | e469a602535fec4355e5b63671eaf52cdd94caaf /drivers/net/ehea/ehea_qmr.c | |
| parent | 96ca4a2cc1454cf633a1e0796b7ef39d937b87ec (diff) | |
| parent | fa53ebac42d3de04619c813f5f6628ca2a7ce97f (diff) | |
| download | kernel_samsung_tuna-152cbcf94baec68b45832db5024184906ab798b1.zip kernel_samsung_tuna-152cbcf94baec68b45832db5024184906ab798b1.tar.gz kernel_samsung_tuna-152cbcf94baec68b45832db5024184906ab798b1.tar.bz2 | |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/ehea/ehea_qmr.c')
| -rw-r--r-- | drivers/net/ehea/ehea_qmr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ehea/ehea_qmr.c index 140f05b..db8a925 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, end_section = start_section + ((nr_pages * PAGE_SIZE) / EHEA_SECTSIZE); mr_len = *(unsigned long *)arg; - ehea_bmap = kzalloc(sizeof(struct ehea_bmap), GFP_KERNEL); + if (!ehea_bmap) + ehea_bmap = kzalloc(sizeof(struct ehea_bmap), GFP_KERNEL); if (!ehea_bmap) return -ENOMEM; |