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

Commit 9e956c2d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

parents 1a6a3589 a6ceda74

drivers/scsi/esp.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -2068,14 +2068,12 @@ static int esp_reset(struct scsi_cmnd *SCptr) 
{

{

	struct esp *esp = (struct esp *) SCptr->device->host->hostdata;

	struct esp *esp = (struct esp *) SCptr->device->host->hostdata;





	spin_lock_irq(esp->ehost->host_lock);

	(void) esp_do_resetbus(esp);

	(void) esp_do_resetbus(esp);



	spin_unlock_irq(esp->ehost->host_lock);

	spin_unlock_irq(esp->ehost->host_lock);





	wait_event(esp->reset_queue, (esp->resetting_bus == 0));

	wait_event(esp->reset_queue, (esp->resetting_bus == 0));





	spin_lock_irq(esp->ehost->host_lock);



	return SUCCESS;

	return SUCCESS;

}

}