Merge ../linus

[linux-drm-fsl-dcu.git] / arch / ia64 / hp / sim / simscsi.c

diff --git a/arch/ia64/hp/sim/simscsi.c b/arch/ia64/hp/sim/simscsi.c
index 8f0a16a79a677c8830b5f5385eb0559fc08fe934..bb87682bbb1be5862ec767e6088fd0de21f1f068 100644 (file)
--- 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);