summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Peter Hurley 2010-10-27 09:28:24 -0400
committerGravatar Stefan Richter 2012-02-05 10:32:44 +0100
commitea4acf08bc71872215be84deabfb42b9133660ab (patch)
treed564bacaeb5465955409b3b21bb364d08cc19ba2 /src
parentretry raw1394_read/write/lock/lock64 with delays after ack-busy (diff)
Reset device fd upon error condition in handle_inotify()
If an error is encountered while adding a new device in inotify handling, make sure the fd is marked invalid (-1). Signed-off-by: Peter Hurley <phurley@charter.net> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'src')
-rw-r--r--src/fw.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/fw.c b/src/fw.c
index cfaab13..2d8a292 100644
--- a/src/fw.c
+++ b/src/fw.c
@@ -426,6 +426,7 @@ handle_inotify(raw1394handle_t handle, struct epoll_closure *ec,
ep.data.ptr = &fwhandle->devices[i].closure;
if (epoll_ctl(fwhandle->epoll_fd, EPOLL_CTL_ADD, fd, &ep) < 0) {
close(fd);
+ fwhandle->devices[i].fd = -1;
return -1;
}
5.html?h=draft-2&id=34a29a3b01d7b8a7ab024b01fa798a120bba7fda&follow=1'>errorsGravatar John Cowan 1-1/+4 2021-07-22more MN-W reviewGravatar John Cowan 1-5/+5 2021-07-20update preview linkGravatar John Cowan 1-1/+1 2021-07-20MN-W reviewGravatar John Cowan 1-6/+6 2021-07-18Fix typo.Gravatar Arthur A. Gleckler 2-4/+4 2021-07-18Add <p> around abstract.Gravatar Arthur A. Gleckler 1-2/+2 2021-07-18Publish first draft.draft-1Gravatar Arthur A. Gleckler 3-0/+114 2021-07-18Ignore trailing whitespace.Gravatar Arthur A. Gleckler 11-129/+129 2021-07-18Ignore "Dictionaries.log".Gravatar Arthur A. Gleckler 1-1/+2 2021-07-18Fix errors reported by W3C HTML Validator.Gravatar Arthur A. Gleckler 1-27/+27 2021-07-18Eliminate unnecessary redirect by using TLS/SSL.Gravatar Arthur A. Gleckler 1-1/+1