From: Andrew Morton Cc: Kylene Jo Hall Signed-off-by: Andrew Morton --- drivers/char/tpm/tpm_bios.c | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-) diff -puN drivers/char/tpm/tpm_bios.c~tpmdd-remove-global-event-log-tidy drivers/char/tpm/tpm_bios.c --- 25/drivers/char/tpm/tpm_bios.c~tpmdd-remove-global-event-log-tidy Fri Dec 9 16:47:48 2005 +++ 25-akpm/drivers/char/tpm/tpm_bios.c Fri Dec 9 16:47:48 2005 @@ -135,12 +135,10 @@ static void *tpm_bios_measurements_start for (i = 0; i < *pos; i++) { event = addr; - if ((addr + sizeof(struct tcpa_event)) < - limit) { + if ((addr + sizeof(struct tcpa_event)) < limit) { if (event->event_type == 0 && event->event_size == 0) return NULL; - addr += - sizeof(struct tcpa_event) + event->event_size; + addr += sizeof(struct tcpa_event) + event->event_size; } } @@ -151,8 +149,7 @@ static void *tpm_bios_measurements_start event = addr; if ((event->event_type == 0 && event->event_size == 0) || - ((addr + sizeof(struct tcpa_event) + event->event_size) >= - limit)) + ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit)) return NULL; return addr; @@ -177,8 +174,7 @@ static void *tpm_bios_measurements_next( return NULL; if ((event->event_type == 0 && event->event_size == 0) || - ((v + sizeof(struct tcpa_event) + event->event_size) >= - limit)) + ((v + sizeof(struct tcpa_event) + event->event_size) >= limit)) return NULL; (*pos)++; @@ -402,8 +398,7 @@ static int read_log(struct tpm_bios_log } if (buff->log_max_len == 0) { - printk(KERN_ERR "%s: ERROR - TCPA log area empty\n", - __func__); + printk(KERN_ERR "%s: ERROR - TCPA log area empty\n", __func__); return -EIO; } @@ -434,7 +429,7 @@ static int tpm_ascii_bios_measurements_o struct seq_file *seq; log = kzalloc(sizeof(struct tpm_bios_log), GFP_KERNEL); - if ( !log ) + if (!log) return -ENOMEM; if ((err = read_log(log))) @@ -442,7 +437,7 @@ static int tpm_ascii_bios_measurements_o /* now register seq file */ err = seq_open(file, &tpm_ascii_b_measurments_seqops); - if ( !err ){ + if (!err) { seq = file->private_data; seq->private = log; } else { @@ -467,7 +462,7 @@ static int tpm_binary_bios_measurements_ struct seq_file *seq; log = kzalloc(sizeof(struct tpm_bios_log), GFP_KERNEL); - if ( !log ) + if (!log) return -ENOMEM; if ((err = read_log(log))) @@ -475,7 +470,7 @@ static int tpm_binary_bios_measurements_ /* now register seq file */ err = seq_open(file, &tpm_binary_b_measurments_seqops); - if ( !err ){ + if (!err) { seq = file->private_data; seq->private = log; } else { _