Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Kernel bump from 4.1.3-rt to 4.1.7-rt.
[kvmfornfv.git]
/
kernel
/
drivers
/
char
/
tpm
/
tpm_ibmvtpm.c
diff --git
a/kernel/drivers/char/tpm/tpm_ibmvtpm.c
b/kernel/drivers/char/tpm/tpm_ibmvtpm.c
index
42ffa5e
..
27ebf95
100644
(file)
--- a/
kernel/drivers/char/tpm/tpm_ibmvtpm.c
+++ b/
kernel/drivers/char/tpm/tpm_ibmvtpm.c
@@
-578,6
+578,9
@@
static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
goto cleanup;
}
goto cleanup;
}
+ ibmvtpm->dev = dev;
+ ibmvtpm->vdev = vio_dev;
+
crq_q = &ibmvtpm->crq_queue;
crq_q->crq_addr = (struct ibmvtpm_crq *)get_zeroed_page(GFP_KERNEL);
if (!crq_q->crq_addr) {
crq_q = &ibmvtpm->crq_queue;
crq_q->crq_addr = (struct ibmvtpm_crq *)get_zeroed_page(GFP_KERNEL);
if (!crq_q->crq_addr) {
@@
-622,8
+625,6
@@
static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
crq_q->index = 0;
crq_q->index = 0;
- ibmvtpm->dev = dev;
- ibmvtpm->vdev = vio_dev;
TPM_VPRIV(chip) = (void *)ibmvtpm;
spin_lock_init(&ibmvtpm->rtce_lock);
TPM_VPRIV(chip) = (void *)ibmvtpm;
spin_lock_init(&ibmvtpm->rtce_lock);