1 files changed, 6 insertions, 5 deletions

diff --git a/arch/mips/loongson/common/mem.c b/arch/mips/loongson/common/mem.c
index ceacd092b446..30eba6001205 100644
--- a/arch/mips/loongson/common/mem.c
+++ b/arch/mips/loongson/common/mem.c
@@ -16,10 +16,11 @@
 
 void __init prom_init_memory(void)
 {
-    add_memory_region(0x0, (memsize << 20), BOOT_MEM_RAM);
+        add_memory_region(0x0, (memsize << 20), BOOT_MEM_RAM);
+
+        add_memory_region(memsize << 20, LOONGSON_PCI_MEM_START - (memsize <<
+                                20), BOOT_MEM_RESERVED);
 
-    add_memory_region(memsize << 20, LOONGSON_PCI_MEM_START - (memsize <<
-                            20), BOOT_MEM_RESERVED);
 #ifdef CONFIG_CPU_SUPPORTS_ADDRWINCFG
         {
                 int bit;
@@ -74,7 +75,7 @@ pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
         unsigned long end = offset + size;
 
         if (__uncached_access(file, offset)) {
-                if (((uca_start && offset) >= uca_start) &&
+                if (uca_start && (offset >= uca_start) &&
                     (end <= uca_end))
                         return __pgprot((pgprot_val(vma_prot) &
                                          ~_CACHE_MASK) |
@@ -95,7 +96,7 @@ static int __init find_vga_mem_init(void)
                 return 0;
 
         for_each_pci_dev(dev) {
-                if ((dev->class >> 8) == PCI_CLASS_DISPLAY_VGA) {
+                if ((dev->class >> 16) == PCI_BASE_CLASS_DISPLAY) {
                         for (idx = 0; idx < PCI_NUM_RESOURCES; idx++) {
                                 r = &dev->resource[idx];
                                 if (!r->start && r->end)