diff options
| author | Alan Cox <alan@linux.intel.com> | 2015-01-20 12:54:50 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-25 09:17:59 -0800 |
| commit | 625505b509b38b3a389cb3f4fd6520a46763bf45 (patch) | |
| tree | e5bcf278e5c4a18a84e31064340eb3822f4a5706 /drivers/pnp | |
| parent | f989e55452c74b4f7b22c889b8ec9f1192aaeec4 (diff) | |
| download | op-kernel-dev-625505b509b38b3a389cb3f4fd6520a46763bf45.zip op-kernel-dev-625505b509b38b3a389cb3f4fd6520a46763bf45.tar.gz | |
pnpbios: bail out on strange errors
A small number of systems respond to PnP dock queries with bogus values.
This causes us to keep logging an error every 2 seconds. Instead of trying
again just assume the BIOS is crapware and doesn't actually have dock
functionality.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/pnpbios/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c index 074569e..facd43b 100644 --- a/drivers/pnp/pnpbios/core.c +++ b/drivers/pnp/pnpbios/core.c @@ -181,7 +181,8 @@ static int pnp_dock_thread(void *unused) break; default: pnpbios_print_status("pnp_dock_thread", status); - continue; + printk(KERN_WARNING "PnPBIOS: disabling dock monitoring.\n"); + complete_and_exit(&unload_sem, 0); } if (d != docked) { if (pnp_dock_event(d, &now) == 0) { |
