From ee22f67c210b9e2a48ccaa798c38cc2a047eef61 Mon Sep 17 00:00:00 2001 From: Pavan Savoy Date: Wed, 10 Aug 2011 10:18:35 -0500 Subject: [PATCH] --- yaml --- r: 263407 b: refs/heads/master c: d0344ef670d686628f369e649c86f71c90ebe222 h: refs/heads/master i: 263405: 1dd4680483ce9e69efcb10d416c3838b78a01a3d 263403: 4d38f12a09a58d496dc3f74e8883b992769d3950 263399: 90e8857380f10c93490c76b42fb3784d60c5a96d 263391: f306af4e6f20d8f12c49e08a79c75d2d56504d9a v: v3 --- [refs] | 2 +- trunk/drivers/misc/ti-st/st_kim.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d2ed0cb2b00e..d6ede44a82a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f81a02ce0693863019dc3fcc532533af6dc0dcd +refs/heads/master: d0344ef670d686628f369e649c86f71c90ebe222 diff --git a/trunk/drivers/misc/ti-st/st_kim.c b/trunk/drivers/misc/ti-st/st_kim.c index 1748a9351de0..d8ca4068a928 100644 --- a/trunk/drivers/misc/ti-st/st_kim.c +++ b/trunk/drivers/misc/ti-st/st_kim.c @@ -473,6 +473,12 @@ long st_kim_start(void *kim_data) pr_info("ldisc_install = 0"); sysfs_notify(&kim_gdata->kim_pdev->dev.kobj, NULL, "install"); + /* the following wait is never going to be completed, + * since the ldisc was never installed, hence serving + * as a mdelay of LDISC_TIME msecs */ + err = wait_for_completion_timeout + (&kim_gdata->ldisc_installed, + msecs_to_jiffies(LDISC_TIME)); err = -ETIMEDOUT; continue; } else { @@ -485,6 +491,13 @@ long st_kim_start(void *kim_data) pr_info("ldisc_install = 0"); sysfs_notify(&kim_gdata->kim_pdev->dev.kobj, NULL, "install"); + /* this wait might be completed, though in the + * tty_close() since the ldisc is already + * installed */ + err = wait_for_completion_timeout + (&kim_gdata->ldisc_installed, + msecs_to_jiffies(LDISC_TIME)); + err = -EINVAL; continue; } else { /* on success don't retry */ break;