Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e13849b7 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: uas: move eh_bus_reset_handler to eh_device_reset_handler 



The bus_reset handler is really a device reset, so move it to
eh_device_reset_handler().

Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 7c3a50bb

drivers/usb/storage/uas.c

+2 −2
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ static int uas_eh_abort_handler(struct scsi_cmnd *cmnd) 
	return FAILED;

}



static int uas_eh_bus_reset_handler(struct scsi_cmnd *cmnd)

static int uas_eh_device_reset_handler(struct scsi_cmnd *cmnd)

{

	struct scsi_device *sdev = cmnd->device;

	struct uas_dev_info *devinfo = sdev->hostdata;
@@ -848,7 +848,7 @@ static struct scsi_host_template uas_host_template = { 
	.slave_alloc = uas_slave_alloc,

	.slave_configure = uas_slave_configure,

	.eh_abort_handler = uas_eh_abort_handler,

	.eh_bus_reset_handler = uas_eh_bus_reset_handler,

	.eh_device_reset_handler = uas_eh_device_reset_handler,

	.this_id = -1,

	.sg_tablesize = SG_NONE,

	.skip_settle_delay = 1,