diff options
| author | NeilBrown <neilb@suse.de> | 2009-12-30 13:46:52 +1100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2009-12-30 13:46:52 +1100 |
| commit | 8409bc51e828bdf748138882e89229d6f6080b7c (patch) | |
| tree | ac4cc8b3b7982a06db6f3ea9005f3c300b1abf8b /probe_roms.c | |
| parent | c1e3ab8c1e76f4ae71ab23bcf5e8c2bf8bd3774e (diff) | |
| parent | dd9bb2fbed335f69225ea1a3514bd27422288a18 (diff) | |
| download | mdadm-8409bc51e828bdf748138882e89229d6f6080b7c.tar.gz mdadm-8409bc51e828bdf748138882e89229d6f6080b7c.tar.xz mdadm-8409bc51e828bdf748138882e89229d6f6080b7c.zip | |
Merge branch 'klockwork' of git://github.com/djbw/mdadm
Conflicts:
super-intel.c
Diffstat (limited to 'probe_roms.c')
| -rw-r--r-- | probe_roms.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/probe_roms.c b/probe_roms.c index a9a8638..0f0ffbc 100644 --- a/probe_roms.c +++ b/probe_roms.c @@ -80,7 +80,7 @@ void probe_roms_exit(void) int probe_roms_init(unsigned long align) { - int fd; + int fd = -1; int rc = 0; /* valid values are 2048 and 512. 512 is for PCI-3.0 compliant @@ -107,9 +107,11 @@ int probe_roms_init(unsigned long align) if (rc == 0) rom_fd = fd; - else + else { + if (fd >= 0) + close(fd); probe_roms_exit(); - + } return rc; } |