diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2010-06-24 10:05:19 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2010-06-24 10:05:19 +0000 |
| commit | a47a3b0ae9c3438c0b472bc4832db2793c3bc339 (patch) | |
| tree | 2d5bb32729158c3c3c685be3749f9d815a840f4f /sys/scsi/sd.c | |
| parent | ded2c74f68121bbf0a8de44283bf76e97e507efb (diff) | |
we cant rely on being able to sleep when dumping, so dont lose the
SCSI_NOSLEEP flag on the xs when setting extra flags by oring them in
rather than assigning them.
from matthew dempsky
Diffstat (limited to 'sys/scsi/sd.c')
| -rw-r--r-- | sys/scsi/sd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index 4ec8862637e..5ff51310ab3 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.196 2010/06/16 02:58:02 krw Exp $ */ +/* $OpenBSD: sd.c,v 1.197 2010/06/24 10:05:18 dlg Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -1332,7 +1332,7 @@ sddump(dev_t dev, daddr64_t blkno, caddr_t va, size_t size) return (ENOMEM); xs->timeout = 10000; - xs->flags = SCSI_POLL | SCSI_DATA_OUT; + xs->flags |= SCSI_DATA_OUT; xs->data = va; xs->datalen = nwrt * sectorsize; |