Merge pull request #1384 from rubenk/irq-close-file-descriptor-on-failure