mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-27 23:20:26 +09:00
tpm: Don't cleanup unless an error happens
At present the cleanup() method is called on every transfer. It should only be called on failing transfers. Fix this and tidy up the error handling a little. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
parent
32e8ee004a
commit
88307654af
@ -72,7 +72,7 @@ int tpm_xfer(struct udevice *dev, const uint8_t *sendbuf, size_t send_size,
|
|||||||
struct tpm_ops *ops = tpm_get_ops(dev);
|
struct tpm_ops *ops = tpm_get_ops(dev);
|
||||||
ulong start, stop;
|
ulong start, stop;
|
||||||
uint count, ordinal;
|
uint count, ordinal;
|
||||||
int ret, ret2;
|
int ret, ret2 = 0;
|
||||||
|
|
||||||
if (ops->xfer)
|
if (ops->xfer)
|
||||||
return ops->xfer(dev, sendbuf, send_size, recvbuf, recv_size);
|
return ops->xfer(dev, sendbuf, send_size, recvbuf, recv_size);
|
||||||
@ -120,9 +120,16 @@ int tpm_xfer(struct udevice *dev, const uint8_t *sendbuf, size_t send_size,
|
|||||||
}
|
}
|
||||||
} while (ret);
|
} while (ret);
|
||||||
|
|
||||||
ret2 = ops->cleanup ? ops->cleanup(dev) : 0;
|
if (ret) {
|
||||||
|
if (ops->cleanup) {
|
||||||
|
ret2 = ops->cleanup(dev);
|
||||||
|
if (ret2)
|
||||||
|
return log_msg_ret("cleanup", ret2);
|
||||||
|
}
|
||||||
|
return log_msg_ret("xfer", ret);
|
||||||
|
}
|
||||||
|
|
||||||
return ret2 ? ret2 : ret;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
UCLASS_DRIVER(tpm) = {
|
UCLASS_DRIVER(tpm) = {
|
||||||
|
Loading…
Reference in New Issue
Block a user