aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm/tpm_atmel.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/tpm/tpm_atmel.c')
-rw-r--r--drivers/char/tpm/tpm_atmel.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
index 0267d8587518..68d5c0991c51 100644
--- a/drivers/char/tpm/tpm_atmel.c
+++ b/drivers/char/tpm/tpm_atmel.c
@@ -141,8 +141,7 @@ static void atml_plat_remove(void)
141 if (chip) { 141 if (chip) {
142 tpm_chip_unregister(chip); 142 tpm_chip_unregister(chip);
143 if (priv->have_region) 143 if (priv->have_region)
144 atmel_release_region(chip->vendor.base, 144 atmel_release_region(priv->base, priv->region_size);
145 priv->region_size);
146 atmel_put_base_addr(chip->vendor.iobase); 145 atmel_put_base_addr(chip->vendor.iobase);
147 platform_device_unregister(pdev); 146 platform_device_unregister(pdev);
148 } 147 }
@@ -191,6 +190,7 @@ static int __init init_atmel(void)
191 goto err_unreg_dev; 190 goto err_unreg_dev;
192 } 191 }
193 192
193 priv->base = base;
194 priv->have_region = have_region; 194 priv->have_region = have_region;
195 priv->region_size = region_size; 195 priv->region_size = region_size;
196 196
@@ -201,7 +201,6 @@ static int __init init_atmel(void)
201 } 201 }
202 202
203 chip->vendor.iobase = iobase; 203 chip->vendor.iobase = iobase;
204 chip->vendor.base = base;
205 chip->vendor.priv = priv; 204 chip->vendor.priv = priv;
206 205
207 rc = tpm_chip_register(chip); 206 rc = tpm_chip_register(chip);