]> git.hungrycats.org Git - linux/commitdiff
[PATCH] Fix PnP BIOS call
authorAdam Belay <ambx1@neo.rr.com>
Tue, 6 Jan 2004 12:08:21 +0000 (04:08 -0800)
committerLinus Torvalds <torvalds@home.osdl.org>
Tue, 6 Jan 2004 12:08:21 +0000 (04:08 -0800)
The recent escd fix I have made corrects a thinko in the PnPBIOS code and it
turns out that faults from calling /proc/pnp/bus/escd were probably not caused
by BIOS bugs.

drivers/pnp/pnpbios/bioscalls.c

index 42e4280bd927dd6268cba27a9df06cf8327e1be2..bd17b09530670ce004ad00446b460e8a5b157bb7 100644 (file)
@@ -493,7 +493,7 @@ static int __pnp_bios_read_escd(char *data, u32 nvram_base)
        if (!pnp_bios_present())
                return ESCD_FUNCTION_NOT_SUPPORTED;
        status = call_pnp_bios(PNP_READ_ESCD, 0, PNP_TS1, PNP_TS2, PNP_DS, 0, 0, 0,
-                              data, 65536, (void *)nvram_base, 65536);
+                              data, 65536, __va(nvram_base), 65536);
        return status;
 }
 
@@ -516,7 +516,7 @@ static int pnp_bios_write_escd(char *data, u32 nvram_base)
        if (!pnp_bios_present())
                return ESCD_FUNCTION_NOT_SUPPORTED;
        status = call_pnp_bios(PNP_WRITE_ESCD, 0, PNP_TS1, PNP_TS2, PNP_DS, 0, 0, 0,
-                              data, 65536, nvram_base, 65536);
+                              data, 65536, __va(nvram_base), 65536);
        return status;
 }
 #endif