On 13/09/15 02:52 PM, Thomas Klausner wrote: > Fixes > passing argument 2 of 'pci_device_cfg_read_u32' from incompatible pointer type > pciaccess.h:153:5: note: expected '__uint32_t *' but argument is of type > 'CARD32 *' > > Signed-off-by: Thomas Klausner <[email protected]> > --- > src/mga_dac3026.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/src/mga_dac3026.c b/src/mga_dac3026.c > index 97c2c7a..bf4e668 100644 > --- a/src/mga_dac3026.c > +++ b/src/mga_dac3026.c > @@ -852,8 +852,12 @@ MGA3026Save(ScrnInfoPtr pScrn, vgaRegPtr vgaReg, > MGARegPtr mgaReg, > mgaReg->DacRegs[i] = inTi3026(MGADACregs[i]); > > #ifdef XSERVER_LIBPCIACCESS > - pci_device_cfg_read_u32(pMga->PciInfo, & mgaReg->Option, > + { > + uint32_t Option; > + pci_device_cfg_read_u32(pMga->PciInfo, & Option, > PCI_OPTION_REG); > + mgaReg->Option = Option; > + } > #else > mgaReg->Option = pciReadLong(pMga->PciTag, PCI_OPTION_REG); > #endif Reviewed-by: Connor Behan <[email protected]>
signature.asc
Description: OpenPGP digital signature
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
