From 3a02852e3914178e3ac9e5ec1d688d1f9f3bfcf5 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 11 Aug 2009 17:06:16 -0700 Subject: [PATCH] --- yaml --- r: 156653 b: refs/heads/master c: 7cb7beb31aa3d941833b6a6e553687422c31e4b6 h: refs/heads/master i: 156651: a13873e384a6ba27347d81a6ea1c4dd5a7b0e74b v: v3 --- [refs] | 2 +- trunk/drivers/base/platform.c | 3 --- trunk/security/selinux/hooks.c | 3 ++- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index db391b85281d..3bf0e6c0fc6d 100644 --- 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 index 81cb01bfc356..456594bd97bc 100644 --- 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 index 15c2a08a66f1..1e8cfc4c2ed6 100644 --- a/trunk/security/selinux/hooks.c +++ b/trunk/security/selinux/hooks.c @@ -1285,6 +1285,8 @@ 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); @@ -1292,7 +1294,6 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent dput(dentry); goto out_unlock; } - kfree(context); len = rc; context = kmalloc(len+1, GFP_NOFS); if (!context) {