diff options
| author | Tom Rini <trini@konsulko.com> | 2022-06-17 09:13:50 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-06-17 09:13:50 -0400 |
| commit | ee4b80a6e276c433f1c59669b7fec47d6146ceaf (patch) | |
| tree | ad1b79d1af1e6595910bbce43e56b8e30bbf44f9 /drivers | |
| parent | 9abfbef57f55f31e42940ac2a18ebccfb087e5c6 (diff) | |
| parent | 3c07d639ede998cb682c284d1ffc4a3ddb062e13 (diff) | |
Merge branch '2022-06-16-assorted-bugfixes'
- A wide array of regression fixes and minor updates
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/crypto/fsl/fsl_hash.c | 6 | ||||
| -rw-r--r-- | drivers/usb/host/ehci-generic.c | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/drivers/crypto/fsl/fsl_hash.c b/drivers/crypto/fsl/fsl_hash.c index 9e6829b7ad..575196778c 100644 --- a/drivers/crypto/fsl/fsl_hash.c +++ b/drivers/crypto/fsl/fsl_hash.c @@ -176,12 +176,6 @@ int caam_hash(const unsigned char *pbuf, unsigned int buf_len, uint32_t *desc; unsigned int size; - if (!IS_ALIGNED((uintptr_t)pbuf, ARCH_DMA_MINALIGN) || - !IS_ALIGNED((uintptr_t)pout, ARCH_DMA_MINALIGN)) { - puts("Error: Address arguments are not aligned\n"); - return -EINVAL; - } - desc = malloc_cache_aligned(sizeof(int) * MAX_CAAM_DESCSIZE); if (!desc) { debug("Not enough memory for descriptor allocation\n"); diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c index 4734af0396..15267e9a05 100644 --- a/drivers/usb/host/ehci-generic.c +++ b/drivers/usb/host/ehci-generic.c @@ -69,7 +69,7 @@ static int ehci_usb_probe(struct udevice *dev) err = 0; ret = clk_get_bulk(dev, &priv->clocks); - if (ret) { + if (ret && ret != -ENOENT) { dev_err(dev, "Failed to get clocks (ret=%d)\n", ret); return ret; } @@ -81,7 +81,7 @@ static int ehci_usb_probe(struct udevice *dev) } err = reset_get_bulk(dev, &priv->resets); - if (err) { + if (ret && ret != -ENOENT) { dev_err(dev, "Failed to get resets (err=%d)\n", err); goto clk_err; } |