xserver: Branch 'master'

[Oliver McFadden]

 hw/xfree86/fbdevhw/fbdevhw.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 464e8ad733fa6afee028607d6e7d4663b4c273cc
Author: Oliver McFadden <oliver.mcfadden at nokia.com>
Date:   Thu Jul 16 17:51:08 2009 +0300

    Coverity Prevent: NEGATIVE_RETURNS in fbdev_open_pci:
    
    Event var_tested_neg: Variable "fd" tested NEGATIVE
    At conditional (1): "fd != -1" taking false path
    335  		    if (fd != -1) {
    
    Event negative_returns: Tracked variable "fd" was passed to a negative sink.
    347  		close(fd);

diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index a585491..2b7e36a 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/hw/xfree86/fbdevhw/fbdevhw.c
@@ -342,10 +342,9 @@ fbdev_open_pci(struct pci_device * pPci, char **namep)
 
 		    return fd;
 		}
+		close(fd);
 	    }
 	}
-
-	close(fd);
     }