---

yaml --- r: 254171 b: refs/heads/master c: 29021bc h: refs/heads/master i: 254169: 13e4058 254167: 486896b v: v3
git-mirror · Jun 7, 2011 · 682d5c3 · 682d5c3
1 parent d50a5d6
commit 682d5c3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;
 }