Revert "usb-storage: fix sdev->host->dma_dev" (97ad4a77) · Commits · 戴 / test

This reverts commit as Hans reports it causes problems on some systems. Until a "real" fix for this can be found, revert this change to get normal functionality back. Link: https://lore.kernel.org/r/70ca74c2-4a80-e25b-eca9-a63a75516673@redhat.com Cc: Tom Yan <tom.ty89@gmail.com> Cc: Alan Stern <stern@rowland.harvard.edu> Tested-by:

Hans de Goede <hdegoede@redhat.com> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/usb/storage/scsiglue.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@ static int slave_alloc (struct scsi_device *sdev)
		static int slave_configure(struct scsi_device *sdev)
		{
		struct us_data *us = host_to_us(sdev->host);
		struct device *dev = sdev->host->dma_dev;
		struct device *dev = us->pusb_dev->bus->sysdev;

		/*
		* Many devices have trouble transferring more than 32KB at a time,

drivers/usb/storage/usb.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -1049,9 +1049,8 @@ int usb_stor_probe2(struct us_data *us)
		goto BadDevice;
		usb_autopm_get_interface_no_resume(us->pusb_intf);
		snprintf(us->scsi_name, sizeof(us->scsi_name), "usb-storage %s",
		dev_name(dev));
		result = scsi_add_host_with_dma(us_to_host(us), dev,
		us->pusb_dev->bus->sysdev);
		dev_name(&us->pusb_intf->dev));
		result = scsi_add_host(us_to_host(us), dev);
		if (result) {
		dev_warn(dev,
		"Unable to add the scsi host\n");

Admin message