---

yaml --- r: 324346 b: refs/heads/master c: 08b79dd h: refs/heads/master v: v3
git-mirror · Sep 26, 2012 · 18e6f84 · 18e6f84
1 parent c1ed940
commit 18e6f84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8885c26d59e683185002271108e8acb812fcd07
+refs/heads/master: 08b79dd10bb24f5fb12446d21d32c87a8136c770
diff --git a/trunk/drivers/char/mmtimer.c b/trunk/drivers/char/mmtimer.c
@@ -826,7 +826,7 @@ static int __init mmtimer_init(void)
 
 	/* Allocate list of node ptrs to mmtimer_t's */
 	timers = kzalloc(sizeof(struct mmtimer_node)*maxn, GFP_KERNEL);
-	if (timers == NULL) {
+	if (!timers) {
 		printk(KERN_ERR "%s: failed to allocate memory for device\n",
 				MMTIMER_NAME);
 		goto out3;
@@ -848,7 +848,6 @@ static int __init mmtimer_init(void)
 	return 0;
 
 out3:
-	kfree(timers);
 	misc_deregister(&mmtimer_miscdev);
 out2:
 	free_irq(SGI_MMTIMER_VECTOR, NULL);