Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 14066
b: refs/heads/master
c: ba260e2
h: refs/heads/master
v: v3
  • Loading branch information
Paolo 'Blaisorblade' Giarrusso authored and Linus Torvalds committed Nov 14, 2005
1 parent 3a92b1b commit a1184f0
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: 7a590611c0f1e1302c58fdfdc958f2d6bdddd78a
refs/heads/master: ba260e23efbabcff975f60401475c2bdd693f872
6 changes: 4 additions & 2 deletions trunk/arch/um/drivers/daemon_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,20 +98,22 @@ static int connect_to_switch(struct daemon_data *pri)
printk("daemon_open : control setup request failed, err = %d\n",
-n);
err = -ENOTCONN;
goto out;
goto out_free;
}

n = os_read_file(pri->control, sun, sizeof(*sun));
if(n != sizeof(*sun)){
printk("daemon_open : read of data socket failed, err = %d\n",
-n);
err = -ENOTCONN;
goto out_close;
goto out_free;
}

pri->data_addr = sun;
return(fd);

out_free:
kfree(sun);
out_close:
os_close_file(fd);
out:
Expand Down

0 comments on commit a1184f0

Please sign in to comment.