Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux

[karo-tx-linux.git] / drivers / pnp / pnpbios / core.c

diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index 074569e77d22ef09784aca56d63714fbf051afcc..facd43b8516cf7af1178772f9e62fc9054fcd82a 100644 (file)
--- 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) {