diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-07-18 07:13:57 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-07-18 07:13:57 +0200 |
| commit | 8d25e409dd5a30bdd26b89c9409720f47b93b4c7 (patch) | |
| tree | 9731066c097aa6a032cf5df753c5dc8e92264fe2 /drivers | |
| parent | 62c40ea9da3d03b960951d61e670ba60326536ef (diff) | |
| parent | db8026e5eb079947ed15ca6be7a164b9b06f96cd (diff) | |
| download | barebox-8d25e409dd5a30bdd26b89c9409720f47b93b4c7.tar.gz barebox-8d25e409dd5a30bdd26b89c9409720f47b93b4c7.tar.xz | |
Merge branch 'for-next/usb'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 2 | ||||
| -rw-r--r-- | drivers/usb/storage/usb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 4dd4d1dddb..30a16103eb 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -307,7 +307,7 @@ ehci_submit_async(struct usb_device *dev, unsigned long pipe, void *buffer, struct usb_host *host = dev->host; struct ehci_host *ehci = to_ehci(host); const bool dir_in = usb_pipein(pipe); - dma_addr_t buffer_dma, req_dma; + dma_addr_t buffer_dma = DMA_ERROR_CODE, req_dma; struct QH *qh = &ehci->qh_list[1]; struct qTD *td; volatile struct qTD *vtd; diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c index b0f789b42a..a43b498e4b 100644 --- a/drivers/usb/storage/usb.c +++ b/drivers/usb/storage/usb.c @@ -420,7 +420,7 @@ static int usb_stor_add_blkdev(struct us_data *us, unsigned char lun) result = cdev_find_free_index("disk"); if (result == -1) pr_err("Cannot find a free number for the disk node\n"); - pr_info("Using index %d for the new disk\n", result); + dev_info(dev, "registering as disk%d\n", result); pblk_dev->blk.cdev.name = basprintf("disk%d", result); pblk_dev->blk.blockbits = SECTOR_SHIFT; |