projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] tty: clarify disassociate_ctty
[powerpc.git]
/
drivers
/
char
/
tpm
/
tpm_atmel.c
diff --git
a/drivers/char/tpm/tpm_atmel.c
b/drivers/char/tpm/tpm_atmel.c
index
58a258c
..
1ab0896
100644
(file)
--- a/
drivers/char/tpm/tpm_atmel.c
+++ b/
drivers/char/tpm/tpm_atmel.c
@@
-116,7
+116,7
@@
static u8 tpm_atml_status(struct tpm_chip *chip)
return ioread8(chip->vendor.iobase + 1);
}
return ioread8(chip->vendor.iobase + 1);
}
-static struct file_operations atmel_ops = {
+static
const
struct file_operations atmel_ops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.open = tpm_open,
.owner = THIS_MODULE,
.llseek = no_llseek,
.open = tpm_open,
@@
-184,7
+184,9
@@
static int __init init_atmel(void)
unsigned long base;
struct tpm_chip *chip;
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, ®ion_size)) == NULL) {
rc = -ENODEV;
if ((iobase = atmel_get_base_addr(&base, ®ion_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;
(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;
}
rc = PTR_ERR(pdev);
goto err_rel_reg;
}