summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2020-04-11 15:04:05 +0300
committerToomas Soome <tsoome@me.com>2020-06-15 20:46:40 +0300
commit772852a5d3501d23ca0f77fcdbd7ddb0a25da28b (patch)
tree23cc711aab570e6e7b167adb04dcfdaae6f22845
parentae121a1498fc4947aa90fa23f0276b59938ed62e (diff)
downloadillumos-joyent-772852a5d3501d23ca0f77fcdbd7ddb0a25da28b.tar.gz
12546 pcieb: NULL pointer errors
Reviewed by: Robert Mustacchi <rm@fingolfin.org> Approved by: Dan McDonald <danmcd@joyent.com>
-rw-r--r--usr/src/uts/sparc/io/pciex/pcieb_sparc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/sparc/io/pciex/pcieb_sparc.c b/usr/src/uts/sparc/io/pciex/pcieb_sparc.c
index bfa544d0c4..9bec9ba294 100644
--- a/usr/src/uts/sparc/io/pciex/pcieb_sparc.c
+++ b/usr/src/uts/sparc/io/pciex/pcieb_sparc.c
@@ -167,7 +167,7 @@ pcieb_plat_ctlops(dev_info_t *rdip, ddi_ctl_enum_t ctlop, void *arg)
void
pcieb_plat_initchild(dev_info_t *child)
{
- intptr_t ppd = NULL;
+ intptr_t ppd = (intptr_t)NULL;
/*
* XXX set ppd to 1 to disable iommu BDF protection on SPARC.
* It relies on unused parent private data for PCI devices.
@@ -204,7 +204,7 @@ pcieb_attach_plx_workarounds(pcieb_devstate_t *pcieb)
uint8_t dev_type = bus_p->bus_dev_type;
uint16_t vendor_id = bus_p->bus_dev_ven_id & 0xFFFF;
uint16_t device_id = bus_p->bus_dev_ven_id >> 16;
- int ce_mask = 0;
+ int ce_mask = 0;
if (!IS_PLX_VENDORID(vendor_id))
return;