From patchwork Wed Mar 30 16:05:38 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jan Beulich <jbeulich@novell.com>
X-Patchwork-Id: 674471
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2UG4jv2029258
	for <patchwork-linux-input@patchwork.kernel.org>;
	Wed, 30 Mar 2011 16:04:46 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753234Ab1C3QEo (ORCPT
	<rfc822;patchwork-linux-input@patchwork.kernel.org>);
	Wed, 30 Mar 2011 12:04:44 -0400
Received: from vpn.id2.novell.com ([195.33.99.129]:35411 "EHLO
	vpn.id2.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751755Ab1C3QEo convert rfc822-to-8bit (ORCPT
	<rfc822;groupwise-JBeulich@novell.com:4:1>);
	Wed, 30 Mar 2011 12:04:44 -0400
Received: from EMEA1-MTA by vpn.id2.novell.com
	with Novell_GroupWise; Wed, 30 Mar 2011 17:04:42 +0100
Message-Id: <4D9370F202000078000392A9@vpn.id2.novell.com>
X-Mailer: Novell GroupWise Internet Agent 8.0.1 
Date: Wed, 30 Mar 2011 17:05:38 +0100
From: "Jan Beulich" <JBeulich@novell.com>
To: <linux-input@vger.kernel.org>
Cc: <stable@kernel.org>, <dtor@mail.ru>, <dilinger@queued.net>
Subject: [PATCH] fix crash in synaptics_module_init()
Mime-Version: 1.0
Content-Disposition: inline
Sender: linux-input-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-input.vger.kernel.org>
X-Mailing-List: linux-input@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Wed, 30 Mar 2011 16:04:46 +0000 (UTC)


--- 2.6.39-rc1/drivers/input/mouse/synaptics.c
+++ 2.6.39-rc1-mouse-synaptics-dmi/drivers/input/mouse/synaptics.c
@@ -836,8 +836,8 @@ static const struct dmi_system_id __init
 		},
 
 	},
-	{ }
 #endif
+	{ }
 };
 
 static bool broken_olpc_ec;
@@ -851,8 +851,8 @@ static const struct dmi_system_id __init
 			DMI_MATCH(DMI_PRODUCT_NAME, "XO"),
 		},
 	},
-	{ }
 #endif
+	{ }
 };
 
 void __init synaptics_module_init(void)