On Thu, 24 Sep 2009, Matthew Wilcox wrote:
> From: Matthew Wilcox <willy@xxxxxxxxxxxxxxx>
>
> Instead of reporting "SCSI emulation for USB Mass Storage devices",
> report "usb-storage 1-4:1.0".
>
> Signed-off-by: Matthew Wilcox <willy@xxxxxxxxxxxxxxx>
Acked-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
> ---
> drivers/usb/storage/scsiglue.c | 3 ++-
> drivers/usb/storage/usb.c | 2 ++
> drivers/usb/storage/usb.h | 1 +
> 3 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
> index cfa26d5..e5e6df3 100644
> --- a/drivers/usb/storage/scsiglue.c
> +++ b/drivers/usb/storage/scsiglue.c
> @@ -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)
> diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
> index 8060b85..39d3e54 100644
> --- a/drivers/usb/storage/usb.c
> +++ b/drivers/usb/storage/usb.c
> @@ -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
> diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
> index 2609efb..6971713 100644
> --- a/drivers/usb/storage/usb.h
> +++ b/drivers/usb/storage/usb.h
> @@ -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 */
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
