git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into core/objtool, to pick up dependent commits
[sfrench/cifs-2.6.git]
/
drivers
/
scsi
/
hisi_sas
/
hisi_sas_v3_hw.c
diff --git
a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 2e5fa9717be89acdcc3b1565c0b1c85a5ab089c1..3f2f0baf2a5edf234749fcab089648c7b14cae17 100644
(file)
--- a/
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@
-1823,7
+1823,7
@@
hisi_sas_shost_alloc_pci(struct pci_dev *pdev)
hisi_hba->shost = shost;
SHOST_TO_SAS_HA(shost) = &hisi_hba->sha;
-
init_timer(&hisi_hba->timer
);
+
timer_setup(&hisi_hba->timer, NULL, 0
);
if (hisi_sas_get_fw_info(hisi_hba) < 0)
goto err_out;