Message ID | 200809051636.26545.hannes.hering@gmx.de (mailing list archive) |
---|---|
State | Handled Elsewhere, archived |
Commit | 70666c71957b62c8e9ea5c0d999a4bfd214c80d2 |
Headers | show |
Hannes Hering wrote: > The ehea busmap must be allocated only once in the first of many calls of the > ehea_create_busmap_callback. > > Signed-off-by: Hannes Hering <hering2@de.ibm.com> > --- > > diff -Nurp -X dontdiff linux-2.6.27-rc5/drivers/net/ehea/ehea_qmr.c patched_kernel/drivers/net/ehea/ehea_qmr.c > --- linux-2.6.27-rc5/drivers/net/ehea/ehea_qmr.c 2008-08-29 00:52:02.000000000 +0200 > +++ patched_kernel/drivers/net/ehea/ehea_qmr.c 2008-09-05 15:31:30.000000000 +0200 > @@ -595,7 +595,8 @@ static int ehea_create_busmap_callback(u > 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; applied
diff -Nurp -X dontdiff linux-2.6.27-rc5/drivers/net/ehea/ehea_qmr.c patched_kernel/drivers/net/ehea/ehea_qmr.c --- linux-2.6.27-rc5/drivers/net/ehea/ehea_qmr.c 2008-08-29 00:52:02.000000000 +0200 +++ patched_kernel/drivers/net/ehea/ehea_qmr.c 2008-09-05 15:31:30.000000000 +0200 @@ -595,7 +595,8 @@ static int ehea_create_busmap_callback(u 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;
The ehea busmap must be allocated only once in the first of many calls of the ehea_create_busmap_callback. Signed-off-by: Hannes Hering <hering2@de.ibm.com>