drm/radeon: fix texture uploads with large 3d textures (bug 13980)

[linux-2.6] / drivers / pnp / support.c

diff --git a/drivers/pnp/support.c b/drivers/pnp/support.c
index 3aeb154e27d6be240642f9c98d03a796e4a774a4..95b076c18c075677cd49449b8bec9bf9492ab0d8 100644 (file)
--- a/drivers/pnp/support.c
+++ b/drivers/pnp/support.c
@@ -45,10 +45,10 @@ void pnp_eisa_id_to_string(u32 id, char *str)
        str[0] = 'A' + ((id >> 26) & 0x3f) - 1;
        str[1] = 'A' + ((id >> 21) & 0x1f) - 1;
        str[2] = 'A' + ((id >> 16) & 0x1f) - 1;
-       str[3] = hex_asc((id >> 12) & 0xf);
-       str[4] = hex_asc((id >>  8) & 0xf);
-       str[5] = hex_asc((id >>  4) & 0xf);
-       str[6] = hex_asc((id >>  0) & 0xf);
+       str[3] = hex_asc_hi(id >> 8);
+       str[4] = hex_asc_lo(id >> 8);
+       str[5] = hex_asc_hi(id);
+       str[6] = hex_asc_lo(id);
        str[7] = '\0';
 }
 
@@ -61,27 +61,27 @@ void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc)
        dev_dbg(&dev->dev, "current resources: %s\n", desc);
 
        for (i = 0; i < PNP_MAX_IRQ; i++) {
-               res = &dev->res.irq_resource[i];
-               if (!(res->flags & IORESOURCE_UNSET))
+               res = pnp_get_resource(dev, IORESOURCE_IRQ, i);
+               if (res && !(res->flags & IORESOURCE_UNSET))
                        dev_dbg(&dev->dev, "  irq %lld flags %#lx\n",
                                (unsigned long long) res->start, res->flags);
        }
        for (i = 0; i < PNP_MAX_DMA; i++) {
-               res = &dev->res.dma_resource[i];
-               if (!(res->flags & IORESOURCE_UNSET))
+               res = pnp_get_resource(dev, IORESOURCE_DMA, i);
+               if (res && !(res->flags & IORESOURCE_UNSET))
                        dev_dbg(&dev->dev, "  dma %lld flags %#lx\n",
                                (unsigned long long) res->start, res->flags);
        }
        for (i = 0; i < PNP_MAX_PORT; i++) {
-               res = &dev->res.port_resource[i];
-               if (!(res->flags & IORESOURCE_UNSET))
+               res = pnp_get_resource(dev, IORESOURCE_IO, i);
+               if (res && !(res->flags & IORESOURCE_UNSET))
                        dev_dbg(&dev->dev, "  io  %#llx-%#llx flags %#lx\n",
                                (unsigned long long) res->start,
                                (unsigned long long) res->end, res->flags);
        }
        for (i = 0; i < PNP_MAX_MEM; i++) {
-               res = &dev->res.mem_resource[i];
-               if (!(res->flags & IORESOURCE_UNSET))
+               res = pnp_get_resource(dev, IORESOURCE_MEM, i);
+               if (res && !(res->flags & IORESOURCE_UNSET))
                        dev_dbg(&dev->dev, "  mem %#llx-%#llx flags %#lx\n",
                                (unsigned long long) res->start,
                                (unsigned long long) res->end, res->flags);