diff options
| author | Julia Lawall <julia@diku.dk> | 2011-11-15 14:53:11 -0800 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-11-22 20:21:10 +0000 |
| commit | c916874d60d9daf2e2d5f4f622b185ef57deb6a4 (patch) | |
| tree | e5e939d2d5565ea59089b3b5ba2c6a325c1bd502 | |
| parent | 21240f9bc1b0ac925cd18b74618327a110022332 (diff) | |
| download | lwn-c916874d60d9daf2e2d5f4f622b185ef57deb6a4.tar.gz lwn-c916874d60d9daf2e2d5f4f622b185ef57deb6a4.zip | |
drivers/gpu/vga/vgaarb.c: add missing kfree
kbuf is a buffer that is local to this function, so all of the error paths
leaving the function should release it.
Signed-off-by: Julia Lawall <julia@diku.dk>
Cc: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/vga/vgaarb.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c index bdde899af72e..111d956d8e7d 100644 --- a/drivers/gpu/vga/vgaarb.c +++ b/drivers/gpu/vga/vgaarb.c @@ -991,14 +991,20 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf, uc = &priv->cards[i]; } - if (!uc) - return -EINVAL; + if (!uc) { + ret_val = -EINVAL; + goto done; + } - if (io_state & VGA_RSRC_LEGACY_IO && uc->io_cnt == 0) - return -EINVAL; + if (io_state & VGA_RSRC_LEGACY_IO && uc->io_cnt == 0) { + ret_val = -EINVAL; + goto done; + } - if (io_state & VGA_RSRC_LEGACY_MEM && uc->mem_cnt == 0) - return -EINVAL; + if (io_state & VGA_RSRC_LEGACY_MEM && uc->mem_cnt == 0) { + ret_val = -EINVAL; + goto done; + } vga_put(pdev, io_state); |