From da01bb28b894498567be8e83ac1b971bf610cbc5 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sat, 5 Jun 2010 19:16:42 +0200 Subject: [PATCH] --- yaml --- r: 200694 b: refs/heads/master c: 44176d9f8265de799512f833ca4d9785aa016b3a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/mrst-touchscreen/intel-mid-touch.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5d5bf5b903fe..1a6f81e563a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb169d1cc7fb219cc42c584f7a195f71913e6b6a +refs/heads/master: 44176d9f8265de799512f833ca4d9785aa016b3a diff --git a/trunk/drivers/staging/mrst-touchscreen/intel-mid-touch.c b/trunk/drivers/staging/mrst-touchscreen/intel-mid-touch.c index 1db00975a594..abba22f921be 100644 --- a/trunk/drivers/staging/mrst-touchscreen/intel-mid-touch.c +++ b/trunk/drivers/staging/mrst-touchscreen/intel-mid-touch.c @@ -817,9 +817,9 @@ static int mrstouch_remove(struct spi_device *spi) free_irq(mrstouchdevp->irq, mrstouchdevp); input_unregister_device(mrstouchdevp->input); input_free_device(mrstouchdevp->input); - kfree(mrstouchdevp); if (mrstouchdevp->pendet_thrd) kthread_stop(mrstouchdevp->pendet_thrd); + kfree(mrstouchdevp); return 0; }