diff options
| author | Toomas Soome <tsoome@me.com> | 2019-01-18 11:53:20 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-02-16 09:37:15 +0200 |
| commit | ae673e5c67dbaeec7e77d54c9f6adbbde5778bfb (patch) | |
| tree | bad6c3606db31374b9406da4d69d963d6737f893 | |
| parent | 1e8ae565d271ff6b153a34f63d6dcada4e81e121 (diff) | |
| download | illumos-joyent-ae673e5c67dbaeec7e77d54c9f6adbbde5778bfb.tar.gz | |
10377 ahci: NULL pointer errors
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Marcel Telka <marcel@telka.sk>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Approved by: Richard Lowe <richlowe@richlowe.net>
| -rw-r--r-- | usr/src/uts/common/io/sata/adapters/ahci/ahci.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr/src/uts/common/io/sata/adapters/ahci/ahci.c b/usr/src/uts/common/io/sata/adapters/ahci/ahci.c index 227fc76b6f..b4246db6c5 100644 --- a/usr/src/uts/common/io/sata/adapters/ahci/ahci.c +++ b/usr/src/uts/common/io/sata/adapters/ahci/ahci.c @@ -2664,7 +2664,7 @@ ahci_tran_abort(dev_info_t *dip, sata_pkt_t *spkt, int flag) * perform a COMRESET. */ (void) ahci_restart_port_wait_till_ready(ahci_ctlp, - ahci_portp, port, NULL, NULL); + ahci_portp, port, 0, NULL); /* * Compute which have finished and which need to be retried. @@ -6266,7 +6266,7 @@ ahci_alloc_rcvd_fis(ahci_ctl_t *ahci_ctlp, ahci_port_t *ahci_portp) NULL, (caddr_t *)&ahci_portp->ahciport_rcvd_fis, &ret_len, - &ahci_portp->ahciport_rcvd_fis_acc_handle) != NULL) { + &ahci_portp->ahciport_rcvd_fis_acc_handle) != 0) { AHCIDBG(AHCIDBG_INIT, ahci_ctlp, "rcvd FIS dma mem alloc fail", NULL); @@ -6358,7 +6358,7 @@ ahci_alloc_cmd_list(ahci_ctl_t *ahci_ctlp, ahci_port_t *ahci_portp) NULL, (caddr_t *)&ahci_portp->ahciport_cmd_list, &ret_len, - &ahci_portp->ahciport_cmd_list_acc_handle) != NULL) { + &ahci_portp->ahciport_cmd_list_acc_handle) != 0) { AHCIDBG(AHCIDBG_INIT, ahci_ctlp, "cmd list dma mem alloc fail", NULL); @@ -6475,8 +6475,7 @@ ahci_alloc_cmd_tables(ahci_ctl_t *ahci_ctlp, ahci_port_t *ahci_portp) NULL, (caddr_t *)&ahci_portp->ahciport_cmd_tables[slot], &ret_len, - &ahci_portp->ahciport_cmd_tables_acc_handle[slot]) != - NULL) { + &ahci_portp->ahciport_cmd_tables_acc_handle[slot]) != 0) { AHCIDBG(AHCIDBG_INIT, ahci_ctlp, "cmd table dma mem alloc fail", NULL); |