mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +00:00
isicom: fix buffer allocation
Fix the rather strange buffer management on open that turned up while auditing for BKL dependencies. Signed-off-by: Alan Cox <alan@redhat.com> Cc: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
fb100b6ea7
commit
8cd64518a3
1 changed files with 6 additions and 8 deletions
|
@ -813,15 +813,13 @@ static int isicom_setup_port(struct isi_port *port)
|
|||
return 0;
|
||||
if (!port->xmit_buf) {
|
||||
/* Relies on BKL */
|
||||
void *xmit_buf = (void *)get_zeroed_page(GFP_KERNEL);
|
||||
|
||||
if (xmit_buf == NULL)
|
||||
unsigned long page = get_zeroed_page(GFP_KERNEL);
|
||||
if (page == 0)
|
||||
return -ENOMEM;
|
||||
if (port->xmit_buf) {
|
||||
free_page((unsigned long)xmit_buf);
|
||||
return -ERESTARTSYS;
|
||||
}
|
||||
port->xmit_buf = xmit_buf;
|
||||
if (port->xmit_buf)
|
||||
free_page(page);
|
||||
else
|
||||
port->xmit_buf = (unsigned char *) page;
|
||||
}
|
||||
|
||||
spin_lock_irqsave(&card->card_lock, flags);
|
||||
|
|
Loading…
Reference in a new issue