From a79ab8fa330ecdef7340ab32723130f9a0cddb70 Mon Sep 17 00:00:00 2001 From: Helge Deller Date: Mon, 14 Jul 2008 10:28:32 -0400 Subject: [PATCH] --- yaml --- r: 104224 b: refs/heads/master c: 305e342bba16730a0821131af6d7d0df43bfff4c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/serio/hp_sdc.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4f593b350545..f92037ff27cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3d1eb19abdcb1e740d8ba0e06d606c1d4165438 +refs/heads/master: 305e342bba16730a0821131af6d7d0df43bfff4c diff --git a/trunk/drivers/input/serio/hp_sdc.c b/trunk/drivers/input/serio/hp_sdc.c index edfedd9a166c..7b233a492ad5 100644 --- a/trunk/drivers/input/serio/hp_sdc.c +++ b/trunk/drivers/input/serio/hp_sdc.c @@ -105,6 +105,10 @@ EXPORT_SYMBOL(__hp_sdc_enqueue_transaction); EXPORT_SYMBOL(hp_sdc_enqueue_transaction); EXPORT_SYMBOL(hp_sdc_dequeue_transaction); +static unsigned int hp_sdc_disabled; +module_param_named(no_hpsdc, hp_sdc_disabled, bool, 0); +MODULE_PARM_DESC(no_hpsdc, "Do not enable HP SDC driver."); + static hp_i8042_sdc hp_sdc; /* All driver state is kept in here. */ /*************** primitives for use in any context *********************/ @@ -980,6 +984,11 @@ static int __init hp_sdc_register(void) unsigned char i; #endif + if (hp_sdc_disabled) { + printk(KERN_WARNING PREFIX "HP SDC driver disabled by no_hpsdc=1.\n"); + return -ENODEV; + } + hp_sdc.dev = NULL; hp_sdc.dev_err = 0; #if defined(__hppa__)