Merge ../linus

5 files changed, 25 insertions, 14 deletions

diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index a082a2e34252..33e1f66e39cb 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -325,9 +325,9 @@ static void user_reader_timeout(unsigned long ptr)
         schedule_work(&chip->work);
 }
 
-static void timeout_work(void *ptr)
+static void timeout_work(struct work_struct *work)
 {
-        struct tpm_chip *chip = ptr;
+        struct tpm_chip *chip = container_of(work, struct tpm_chip, work);
 
         down(&chip->buffer_mutex);
         atomic_set(&chip->data_pending, 0);
@@ -1105,7 +1105,7 @@ struct tpm_chip *tpm_register_hardware(struct device *dev, const struct tpm_vend
         init_MUTEX(&chip->tpm_mutex);
         INIT_LIST_HEAD(&chip->list);
 
-        INIT_WORK(&chip->work, timeout_work, chip);
+        INIT_WORK(&chip->work, timeout_work);
 
         init_timer(&chip->user_read_timer);
         chip->user_read_timer.function = user_reader_timeout;
@@ -1130,7 +1130,7 @@ struct tpm_chip *tpm_register_hardware(struct device *dev, const struct tpm_vend
         scnprintf(devname, DEVNAME_SIZE, "%s%d", "tpm", chip->dev_num);
         chip->vendor.miscdev.name = devname;
 
-        chip->vendor.miscdev.dev = dev;
+        chip->vendor.miscdev.parent = dev;
         chip->dev = get_device(dev);
 
         if (misc_register(&chip->vendor.miscdev)) {
@@ -1153,7 +1153,15 @@ struct tpm_chip *tpm_register_hardware(struct device *dev, const struct tpm_vend
 
         spin_unlock(&driver_lock);
 
-        sysfs_create_group(&dev->kobj, chip->vendor.attr_group);
+        if (sysfs_create_group(&dev->kobj, chip->vendor.attr_group)) {
+                list_del(&chip->list);
+                misc_deregister(&chip->vendor.miscdev);
+                put_device(dev);
+                clear_bit(chip->dev_num, dev_mask);
+                kfree(chip);
+                kfree(devname);
+                return NULL;
+        }
 
         chip->bios_dir = tpm_bios_log_setup(devname);
 
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 050ced247f68..bb9a43c6cf3d 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -22,6 +22,7 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/fs.h>
+#include <linux/sched.h>
 #include <linux/miscdevice.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
index ad8ffe49256f..1ab0896070be 100644
--- a/drivers/char/tpm/tpm_atmel.c
+++ b/drivers/char/tpm/tpm_atmel.c
@@ -184,7 +184,9 @@ static int __init init_atmel(void)
         unsigned long base;
         struct  tpm_chip *chip;
 
-        driver_register(&atml_drv);
+        rc = driver_register(&atml_drv);
+        if (rc)
+                return rc;
 
         if ((iobase = atmel_get_base_addr(&base, &region_size)) == NULL) {
                 rc = -ENODEV;
@@ -195,10 +197,8 @@ static int __init init_atmel(void)
             (atmel_request_region
              (tpm_atmel.base, region_size, "tpm_atmel0") == NULL) ? 0 : 1;
 
-
-        if (IS_ERR
-            (pdev =
-             platform_device_register_simple("tpm_atmel", -1, NULL, 0))) {
+        pdev = platform_device_register_simple("tpm_atmel", -1, NULL, 0);
+        if (IS_ERR(pdev)) {
                 rc = PTR_ERR(pdev);
                 goto err_rel_reg;
         }
diff --git a/drivers/char/tpm/tpm_nsc.c b/drivers/char/tpm/tpm_nsc.c
index 26287aace87d..608f73071bef 100644
--- a/drivers/char/tpm/tpm_nsc.c
+++ b/drivers/char/tpm/tpm_nsc.c
@@ -284,7 +284,7 @@ static struct device_driver nsc_drv = {
 static int __init init_nsc(void)
 {
         int rc = 0;
-        int lo, hi;
+        int lo, hi, err;
         int nscAddrBase = TPM_ADDR;
         struct tpm_chip *chip;
         unsigned long base;
@@ -297,7 +297,9 @@ static int __init init_nsc(void)
                         return -ENODEV;
         }
 
-        driver_register(&nsc_drv);
+        err = driver_register(&nsc_drv);
+        if (err)
+                return err;
 
         hi = tpm_read_index(nscAddrBase, TPM_NSC_BASE0_HI);
         lo = tpm_read_index(nscAddrBase, TPM_NSC_BASE0_LO);
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index ee7ac6f43c65..483f3f60013c 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -377,7 +377,7 @@ static struct tpm_vendor_specific tpm_tis = {
                     .fops = &tis_ops,},
 };
 
-static irqreturn_t tis_int_probe(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t tis_int_probe(int irq, void *dev_id)
 {
         struct tpm_chip *chip = (struct tpm_chip *) dev_id;
         u32 interrupt;
@@ -397,7 +397,7 @@ static irqreturn_t tis_int_probe(int irq, void *dev_id, struct pt_regs *regs)
         return IRQ_HANDLED;
 }
 
-static irqreturn_t tis_int_handler(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t tis_int_handler(int irq, void *dev_id)
 {
         struct tpm_chip *chip = (struct tpm_chip *) dev_id;
         u32 interrupt;