Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[mirror_ubuntu-bionic-kernel.git] / drivers / scsi / libsas / sas_init.c

diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c
index d3f5b57b3ebfec1c09c50e1c9757af64f44dbeb4..64fa6f53cb8bafced9c0e9b44e787a12a55de63b 100644 (file)
--- a/drivers/scsi/libsas/sas_init.c
+++ b/drivers/scsi/libsas/sas_init.c
@@ -66,7 +66,8 @@ struct sas_task *sas_alloc_slow_task(gfp_t flags)
        }
 
        task->slow_task = slow;
-       init_timer(&slow->timer);
+       slow->task = task;
+       timer_setup(&slow->timer, NULL, 0);
        init_completion(&slow->completion);
 
        return task;