---

yaml --- r: 156653 b: refs/heads/master c: 7cb7beb h: refs/heads/master i: 156651: a13873e v: v3
git-mirror · Aug 12, 2009 · 3a02852 · 3a02852
1 parent 61ea369
commit 3a02852
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7369e01eb85550ed60dd1b0e120b69dfb03dc23
+refs/heads/master: 7cb7beb31aa3d941833b6a6e553687422c31e4b6
diff --git a/trunk/drivers/base/platform.c b/trunk/drivers/base/platform.c
@@ -483,9 +483,6 @@ int platform_driver_register(struct platform_driver *drv)
 		drv->driver.remove = platform_drv_remove;
 	if (drv->shutdown)
 		drv->driver.shutdown = platform_drv_shutdown;
-	if (drv->suspend || drv->resume)
-		pr_warning("Platform driver '%s' needs updating - please use "
-			"dev_pm_ops\n", drv->driver.name);
 
 	return driver_register(&drv->driver);
 }

diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c
@@ -1285,14 +1285,15 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent
 		rc = inode->i_op->getxattr(dentry, XATTR_NAME_SELINUX,
 					   context, len);
 		if (rc == -ERANGE) {
+			kfree(context);
+
 			/* Need a larger buffer.  Query for the right size. */
 			rc = inode->i_op->getxattr(dentry, XATTR_NAME_SELINUX,
 						   NULL, 0);
 			if (rc < 0) {
 				dput(dentry);
 				goto out_unlock;
 			}
-			kfree(context);
 			len = rc;
 			context = kmalloc(len+1, GFP_NOFS);
 			if (!context) {