From 9636c7c653915332aa1d4894e5bdb695e33d0455 Mon Sep 17 00:00:00 2001 From: thomas schorpp Date: Fri, 3 Oct 2008 23:45:29 +0200 Subject: [PATCH] --- yaml --- r: 117701 b: refs/heads/master c: 7583221f6066978487f14caf31b4ea5d99713bfa h: refs/heads/master i: 117699: 46ec249f84c804fb55d9ca26f63a973b48967fe1 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/aic7xxx/aic7xxx_core.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 17006bd30378..be5630897c1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d91ab4e7df0c0c9f98c830e04e875f39d41b21f6 +refs/heads/master: 7583221f6066978487f14caf31b4ea5d99713bfa diff --git a/trunk/drivers/scsi/aic7xxx/aic7xxx_core.c b/trunk/drivers/scsi/aic7xxx/aic7xxx_core.c index 0ae2b4605d09..e6f2bb7365e6 100644 --- a/trunk/drivers/scsi/aic7xxx/aic7xxx_core.c +++ b/trunk/drivers/scsi/aic7xxx/aic7xxx_core.c @@ -814,6 +814,7 @@ ahc_intr(struct ahc_softc *ahc) static void ahc_restart(struct ahc_softc *ahc) { + uint8_t sblkctl; ahc_pause(ahc); @@ -868,6 +869,12 @@ ahc_restart(struct ahc_softc *ahc) ahc_outb(ahc, SEQADDR0, 0); ahc_outb(ahc, SEQADDR1, 0); + /* + * Take the LED out of diagnostic mode on PM resume, too + */ + sblkctl = ahc_inb(ahc, SBLKCTL); + ahc_outb(ahc, SBLKCTL, (sblkctl & ~(DIAGLEDEN|DIAGLEDON))); + ahc_unpause(ahc); }