mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
USB: usb-storage: Associate the name of the interface with the scsi host
Instead of reporting "SCSI emulation for USB Mass Storage devices", report "usb-storage 1-4:1.0". Signed-off-by: Matthew Wilcox <willy@linux.intel.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
b1f0a34ca9
commit
00fa43ef09
3 changed files with 5 additions and 1 deletions
|
@ -73,7 +73,8 @@
|
|||
|
||||
static const char* host_info(struct Scsi_Host *host)
|
||||
{
|
||||
return "SCSI emulation for USB Mass Storage devices";
|
||||
struct us_data *us = host_to_us(host);
|
||||
return us->scsi_name;
|
||||
}
|
||||
|
||||
static int slave_alloc (struct scsi_device *sdev)
|
||||
|
|
|
@ -929,6 +929,8 @@ int usb_stor_probe2(struct us_data *us)
|
|||
result = usb_stor_acquire_resources(us);
|
||||
if (result)
|
||||
goto BadDevice;
|
||||
snprintf(us->scsi_name, sizeof(us->scsi_name), "usb-storage %s",
|
||||
dev_name(&us->pusb_intf->dev));
|
||||
result = scsi_add_host(us_to_host(us), &us->pusb_intf->dev);
|
||||
if (result) {
|
||||
printk(KERN_WARNING USB_STORAGE
|
||||
|
|
|
@ -132,6 +132,7 @@ struct us_data {
|
|||
/* SCSI interfaces */
|
||||
struct scsi_cmnd *srb; /* current srb */
|
||||
unsigned int tag; /* current dCBWTag */
|
||||
char scsi_name[32]; /* scsi_host name */
|
||||
|
||||
/* control and bulk communications data */
|
||||
struct urb *current_urb; /* USB requests */
|
||||
|
|
Loading…
Reference in a new issue