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

Commit cc33895a authored by Andrew Morton's avatar Andrew Morton Committed by James Bottomley
Browse files

[SCSI] aic79xx: ahd_linux_dev_reset() cleanup 



Use the macros consistently in ahd_linux_dev_reset().

If ahd_linux_dev_reset() really can be called with local interrupts disabled
then yuk.

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent ace4e718

drivers/scsi/aic7xxx/aic79xx_osm.c

+2 −2
Original line number Diff line number Diff line
@@ -1553,7 +1553,7 @@ ahd_linux_dev_reset(Scsi_Cmnd *cmd) 
	ahd_queue_scb(ahd, scb);



	scb->platform_data->flags |= AHD_SCB_UP_EH_SEM;

	spin_unlock_irq(&ahd->platform_data->spin_lock);

	ahd_unlock(ahd, &s);

	init_timer(&timer);

	timer.data = (u_long)scb;

	timer.expires = jiffies + (5 * HZ);
@@ -1567,7 +1567,7 @@ ahd_linux_dev_reset(Scsi_Cmnd *cmd) 
		printf("Timer Expired\n");

		retval = FAILED;

	}

	spin_lock_irq(&ahd->platform_data->spin_lock);

	ahd_lock(ahd, &s);

	ahd_schedule_runq(ahd);

	ahd_linux_run_complete_queue(ahd);

	ahd_unlock(ahd, &s);