summaryrefslogtreecommitdiffstats
path: root/arch/ia64/hp/sim/simscsi.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-10-11 09:56:12 +0200
committerJeff Garzik <jeff@garzik.org>2006-10-11 09:56:12 +0200
commit24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch)
tree7147b206304b028c3cfd5de6317e5c8510098ca9 /arch/ia64/hp/sim/simscsi.c
parent[netdrvr] b44: handle excessive multicast groups (diff)
parentACPI: Allow setting SCI_EN bit in PM1_CONTROL register (diff)
downloadlinux-24fcbacedb0d83cabc6761acbecfbf751265ce52.tar.xz
linux-24fcbacedb0d83cabc6761acbecfbf751265ce52.zip
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'arch/ia64/hp/sim/simscsi.c')
-rw-r--r--arch/ia64/hp/sim/simscsi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/hp/sim/simscsi.c b/arch/ia64/hp/sim/simscsi.c
index 8f0a16a79a67..bb87682bbb1b 100644
--- a/arch/ia64/hp/sim/simscsi.c
+++ b/arch/ia64/hp/sim/simscsi.c
@@ -103,7 +103,7 @@ simscsi_interrupt (unsigned long val)
while ((sc = queue[rd].sc) != 0) {
atomic_dec(&num_reqs);
- queue[rd].sc = 0;
+ queue[rd].sc = NULL;
if (DBG)
printk("simscsi_interrupt: done with %ld\n", sc->serial_number);
(*sc->scsi_done)(sc);