|
 |
2c6af93 |
From MAILER-DAEMON Wed Jan 27 14:16:57 2021
|
|
|
2c6af93 |
From: Takashi Iwai <tiwai@suse.de>
|
|
|
2c6af93 |
To: Hans Verkuil <hverkuil@xs4all.nl>
|
|
|
2c6af93 |
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
|
|
|
2c6af93 |
Subject: [PATCH] media: pwc: Fix the URB buffer allocation
|
|
|
2c6af93 |
Date: Thu, 21 Jan 2021 21:28:55 +0100
|
|
|
2c6af93 |
Message-Id: <20210121202855.17400-1-tiwai@suse.de>
|
|
|
2c6af93 |
List-ID: <linux-media.vger.kernel.org>
|
|
|
2c6af93 |
X-Mailing-List: linux-media@vger.kernel.org
|
|
|
2c6af93 |
MIME-Version: 1.0
|
|
|
2c6af93 |
Content-Type: text/plain; charset="utf-8"
|
|
|
2c6af93 |
Content-Transfer-Encoding: 7bit
|
|
|
2c6af93 |
|
|
|
2c6af93 |
The URB buffer allocation of pwc driver involves with the
|
|
|
2c6af93 |
dma_map_single(), and it needs to pass the right device. Currently it
|
|
|
2c6af93 |
passes usb_device.dev, but it's no real device that manages the DMA.
|
|
|
2c6af93 |
Since the passed device has no DMA mask set up, now the pwc driver
|
|
|
2c6af93 |
hits the WARN_ON_ONCE() check in dma_map_page_attrs() (that was
|
|
|
2c6af93 |
introduced in 5.10), resulting in an error at URB allocations.
|
|
|
2c6af93 |
Eventually this ended up with the black output.
|
|
|
2c6af93 |
|
|
|
2c6af93 |
This patch fixes the bug by passing the proper device, the bus
|
|
|
2c6af93 |
controller, to make the URB allocation and map working again.
|
|
|
2c6af93 |
|
|
|
2c6af93 |
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
|
2c6af93 |
Reviewed-by: Robert Foss <robert.foss@linaro.org>
|
|
|
2c6af93 |
Cc: <stable@vger.kernel.org>
|
|
|
2c6af93 |
BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1181133
|
|
|
2c6af93 |
---
|
|
|
2c6af93 |
drivers/media/usb/pwc/pwc-if.c | 4 ++--
|
|
|
2c6af93 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
2c6af93 |
|
|
|
2c6af93 |
diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c
|
|
|
2c6af93 |
index 61869636ec61..d771160bb168 100644
|
|
|
2c6af93 |
--- a/drivers/media/usb/pwc/pwc-if.c
|
|
|
2c6af93 |
+++ b/drivers/media/usb/pwc/pwc-if.c
|
|
|
2c6af93 |
@@ -461,7 +461,7 @@ static int pwc_isoc_init(struct pwc_device *pdev)
|
|
|
2c6af93 |
urb->pipe = usb_rcvisocpipe(udev, pdev->vendpoint);
|
|
|
2c6af93 |
urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP;
|
|
|
2c6af93 |
urb->transfer_buffer_length = ISO_BUFFER_SIZE;
|
|
|
2c6af93 |
- urb->transfer_buffer = pwc_alloc_urb_buffer(&udev->dev,
|
|
|
2c6af93 |
+ urb->transfer_buffer = pwc_alloc_urb_buffer(udev->bus->controller,
|
|
|
2c6af93 |
urb->transfer_buffer_length,
|
|
|
2c6af93 |
&urb->transfer_dma);
|
|
|
2c6af93 |
if (urb->transfer_buffer == NULL) {
|
|
|
2c6af93 |
@@ -524,7 +524,7 @@ static void pwc_iso_free(struct pwc_device *pdev)
|
|
|
2c6af93 |
if (urb) {
|
|
|
2c6af93 |
PWC_DEBUG_MEMORY("Freeing URB\n");
|
|
|
2c6af93 |
if (urb->transfer_buffer)
|
|
|
2c6af93 |
- pwc_free_urb_buffer(&urb->dev->dev,
|
|
|
2c6af93 |
+ pwc_free_urb_buffer(urb->dev->bus->controller,
|
|
|
2c6af93 |
urb->transfer_buffer_length,
|
|
|
2c6af93 |
urb->transfer_buffer,
|
|
|
2c6af93 |
urb->transfer_dma);
|
|
|
2c6af93 |
--
|
|
|
2c6af93 |
2.26.2
|
|
|
2c6af93 |
|
|
|
2c6af93 |
|