android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: usb-storage: Associate the name of the interface with the scsi host

Browse Source 
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:
Matthew Wilcox
2009-09-24 16:19:11 -06:00
committed by Greg Kroah-Hartman
parent b1f0a34ca9
commit 00fa43ef09
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/usb/storage/scsiglue.c
View File

@ -73,7 +73,8 @@
static const char* host_info(struct Scsi_Host *host) 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) static int slave_alloc (struct scsi_device *sdev)

2
drivers/usb/storage/usb.c
View File

@ -929,6 +929,8 @@ int usb_stor_probe2(struct us_data *us)
result = usb_stor_acquire_resources(us); result = usb_stor_acquire_resources(us);
if (result) if (result)
goto BadDevice; 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); result = scsi_add_host(us_to_host(us), &us->pusb_intf->dev);
if (result) { if (result) {
printk(KERN_WARNING USB_STORAGE printk(KERN_WARNING USB_STORAGE

1
drivers/usb/storage/usb.h
View File

@ -132,6 +132,7 @@ struct us_data {
/* SCSI interfaces */ /* SCSI interfaces */
struct scsi_cmnd *srb; /* current srb */ struct scsi_cmnd *srb; /* current srb */
unsigned int tag; /* current dCBWTag */ unsigned int tag; /* current dCBWTag */
char scsi_name[32]; /* scsi_host name */
/* control and bulk communications data */ /* control and bulk communications data */
struct urb *current_urb; /* USB requests */ struct urb *current_urb; /* USB requests */