Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 263817
b: refs/heads/master
c: 45cd5e2
h: refs/heads/master
i:
  263815: 0942c89
v: v3
  • Loading branch information
Al Viro authored and Linus Torvalds committed Sep 15, 2011
1 parent cb7ac86 commit a8c7695
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f71f94845e0126884eca8ce57a92e30b189c8e71
refs/heads/master: 45cd5e2d4e632f55af1d6131f33b554c98f8b929
6 changes: 4 additions & 2 deletions trunk/arch/um/drivers/line.c
Original file line number Diff line number Diff line change
Expand Up @@ -725,15 +725,17 @@ struct winch {

static void free_winch(struct winch *winch, int free_irq_ok)
{
int fd = winch->fd;
winch->fd = -1;
if (free_irq_ok)
free_irq(WINCH_IRQ, winch);

list_del(&winch->list);

if (winch->pid != -1)
os_kill_process(winch->pid, 1);
if (winch->fd != -1)
os_close_file(winch->fd);
if (fd != -1)
os_close_file(fd);
if (winch->stack != 0)
free_stack(winch->stack, 0);
kfree(winch);
Expand Down

0 comments on commit a8c7695

Please sign in to comment.