Commit 8cd64518 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

isicom: fix buffer allocation

Fix the rather strange buffer management on open that turned up while auditing
for BKL dependencies.
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fb100b6e
...@@ -813,15 +813,13 @@ static int isicom_setup_port(struct isi_port *port) ...@@ -813,15 +813,13 @@ static int isicom_setup_port(struct isi_port *port)
return 0; return 0;
if (!port->xmit_buf) { if (!port->xmit_buf) {
/* Relies on BKL */ /* Relies on BKL */
void *xmit_buf = (void *)get_zeroed_page(GFP_KERNEL); unsigned long page = get_zeroed_page(GFP_KERNEL);
if (page == 0)
if (xmit_buf == NULL)
return -ENOMEM; return -ENOMEM;
if (port->xmit_buf) { if (port->xmit_buf)
free_page((unsigned long)xmit_buf); free_page(page);
return -ERESTARTSYS; else
} port->xmit_buf = (unsigned char *) page;
port->xmit_buf = xmit_buf;
} }
spin_lock_irqsave(&card->card_lock, flags); spin_lock_irqsave(&card->card_lock, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment