From 1cf69377d89efb5f050ff0c3e5651b3b438980cc Mon Sep 17 00:00:00 2001
From: Tony Breeds <tony@bakeyournoodle.com>
Date: Tue, 3 Mar 2009 17:59:30 +0000
Subject: [PATCH] --- yaml --- r: 132019 b: refs/heads/master c:
 368a12117dd8abf6eaefa37c21ac313b517128b9 h: refs/heads/master i:   132017:
 f75683f3e3a619f8d12a863f17b3bc27b0cb209b   132015:
 566300c767fc407db41e7e02406921f98446b4f7 v: v3

---
 [refs]                                         | 2 +-
 trunk/arch/powerpc/platforms/86xx/gef_sbc610.c | 4 ++++
 trunk/drivers/gpu/drm/drm_stub.c               | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fc5ad8a84622..f69f3b26111c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ad8b7d12605e88d1e532061699102797fdefe08
+refs/heads/master: 368a12117dd8abf6eaefa37c21ac313b517128b9
diff --git a/trunk/arch/powerpc/platforms/86xx/gef_sbc610.c b/trunk/arch/powerpc/platforms/86xx/gef_sbc610.c
index fb371f5ce132..d6b772ba3b8f 100644
--- a/trunk/arch/powerpc/platforms/86xx/gef_sbc610.c
+++ b/trunk/arch/powerpc/platforms/86xx/gef_sbc610.c
@@ -142,6 +142,10 @@ static void __init gef_sbc610_nec_fixup(struct pci_dev *pdev)
 {
 	unsigned int val;
 
+	/* Do not do the fixup on other platforms! */
+	if (!machine_is(gef_sbc610))
+		return;
+
 	printk(KERN_INFO "Running NEC uPD720101 Fixup\n");
 
 	/* Ensure ports 1, 2, 3, 4 & 5 are enabled */
diff --git a/trunk/drivers/gpu/drm/drm_stub.c b/trunk/drivers/gpu/drm/drm_stub.c
index 7c8b15b22bf2..096e2a37446d 100644
--- a/trunk/drivers/gpu/drm/drm_stub.c
+++ b/trunk/drivers/gpu/drm/drm_stub.c
@@ -168,7 +168,7 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data,
 	    file_priv->minor->master != file_priv->master) {
 		mutex_lock(&dev->struct_mutex);
 		file_priv->minor->master = drm_master_get(file_priv->master);
-		mutex_unlock(&dev->struct_mutex);
+		mutex_lock(&dev->struct_mutex);
 	}
 
 	return 0;