diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-11-25 00:45:07 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-11-25 15:05:18 -0500 |
| commit | 81eafe9f93a272b06aa9f9235ec5676b9aa3ee3e (patch) | |
| tree | 926bdfbd5ecd56faed80ac36aea7861c9c912d66 /hw | |
| parent | 09bfb25e031772611a2f0902d4ba77b587e4bdb2 (diff) | |
Warning fix.
vbe.c: In function ‘VBEReadPanelID’:
vbe.c:1145: warning: return from incompatible pointer type
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xfree86/vbe/vbe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c index 8af1727cc..4986b5b29 100644 --- a/hw/xfree86/vbe/vbe.c +++ b/hw/xfree86/vbe/vbe.c @@ -1108,7 +1108,7 @@ VBEReadPanelID(vbeInfoPtr pVbe) { int RealOff = pVbe->real_mode_base; pointer page = pVbe->memory; - unsigned char *tmp = NULL; + void *tmp = NULL; int screen = pVbe->pInt10->scrnIndex; pVbe->pInt10->ax = 0x4F11; @@ -1129,8 +1129,8 @@ VBEReadPanelID(vbeInfoPtr pVbe) switch (pVbe->pInt10->ax & 0xff00) { case 0x0: xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE PanelID read successfully\n"); - tmp = (unsigned char *)xnfalloc(32); - memcpy(tmp,page,32); + tmp = xnfalloc(32); + memcpy(tmp, page, 32); break; case 0x100: xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE PanelID read failed\n"); |