Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / drivers / scsi / qla1280.c

diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 5a522c5bbd433910e3f745005fe3bc6ded93da54..97dabd39b0925f907ee206ee962006ca20b436ac 100644 (file)
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -2502,7 +2502,7 @@ qla1280_mailbox_command(struct scsi_qla_host *ha, uint8_t mr, uint16_t *mb)
        /* Issue set host interrupt command. */
 
        /* set up a timer just in case we're really jammed */
-       init_timer(&timer);
+       init_timer_on_stack(&timer);
        timer.expires = jiffies + 20*HZ;
        timer.data = (unsigned long)ha;
        timer.function = qla1280_mailbox_timeout;