Merge tag 'v3.15-rc6' into sched/core, to pick up the latest fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

3 files changed, 9 insertions, 7 deletions

diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
index 8121b4c70ede..b29703324e94 100644
--- a/drivers/char/agp/frontend.c
+++ b/drivers/char/agp/frontend.c
@@ -730,6 +730,7 @@ static int agpioc_info_wrap(struct agp_file_private *priv, void __user *arg)
 
         agp_copy_info(agp_bridge, &kerninfo);
 
+        memset(&userinfo, 0, sizeof(userinfo));
         userinfo.version.major = kerninfo.version.major;
         userinfo.version.minor = kerninfo.version.minor;
         userinfo.bridge_id = kerninfo.device->vendor |
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 6b75713d953a..102c50d38902 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -995,8 +995,11 @@ retry:
                 ibytes = min_t(size_t, ibytes, have_bytes - reserved);
         if (ibytes < min)
                 ibytes = 0;
-        entropy_count = max_t(int, 0,
-                              entropy_count - (ibytes << (ENTROPY_SHIFT + 3)));
+        if (have_bytes >= ibytes + reserved)
+                entropy_count -= ibytes << (ENTROPY_SHIFT + 3);
+        else
+                entropy_count = reserved << (ENTROPY_SHIFT + 3);
+
         if (cmpxchg(&r->entropy_count, orig, entropy_count) != orig)
                 goto retry;
 
diff --git a/drivers/char/tpm/tpm_ppi.c b/drivers/char/tpm/tpm_ppi.c
index b3ea223585bd..61dcc8011ec7 100644
--- a/drivers/char/tpm/tpm_ppi.c
+++ b/drivers/char/tpm/tpm_ppi.c
@@ -328,13 +328,11 @@ int tpm_add_ppi(struct kobject *parent)
         /* Cache TPM ACPI handle and version string */
         acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX,
                             ppi_callback, NULL, NULL, &tpm_ppi_handle);
-        if (tpm_ppi_handle == NULL)
-                return -ENODEV;
-
-        return sysfs_create_group(parent, &ppi_attr_grp);
+        return tpm_ppi_handle ? sysfs_create_group(parent, &ppi_attr_grp) : 0;
 }
 
 void tpm_remove_ppi(struct kobject *parent)
 {
-        sysfs_remove_group(parent, &ppi_attr_grp);
+        if (tpm_ppi_handle)
+                sysfs_remove_group(parent, &ppi_attr_grp);
 }