From 682d5c353518bf600c599baab2db828c72afacf3 Mon Sep 17 00:00:00 2001 From: J Freyensee Date: Wed, 25 May 2011 14:38:18 -0700 Subject: [PATCH] --- yaml --- r: 254171 b: refs/heads/master c: 29021bccea0dc42d7d101004058438a9a4e693b1 h: refs/heads/master i: 254169: 13e4058251de73f56a6b0ae95bbeb592e0eb0775 254167: 486896b6a74d4137c68db5efdc08bc75831c953c v: v3 --- [refs] | 2 +- trunk/drivers/misc/pti.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6848b9e943ba..818b9536151a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d031d94da453077bbc6108b7822fc751ac85299 +refs/heads/master: 29021bccea0dc42d7d101004058438a9a4e693b1 diff --git a/trunk/drivers/misc/pti.c b/trunk/drivers/misc/pti.c index bb6f9255c17c..be4857358d91 100644 --- a/trunk/drivers/misc/pti.c +++ b/trunk/drivers/misc/pti.c @@ -317,7 +317,8 @@ EXPORT_SYMBOL_GPL(pti_request_masterchannel); * a master, channel ID address * used to write to PTI HW. * - * @mc: master, channel apeture ID address to be released. + * @mc: master, channel apeture ID address to be released. This + * will de-allocate the structure via kfree(). */ void pti_release_masterchannel(struct pti_masterchannel *mc) { @@ -581,7 +582,7 @@ static int pti_char_open(struct inode *inode, struct file *filp) static int pti_char_release(struct inode *inode, struct file *filp) { pti_release_masterchannel(filp->private_data); - kfree(filp->private_data); + filp->private_data = NULL; return 0; }