Merge branch 'next-s3c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux

[mirror_ubuntu-artful-kernel.git] / drivers / pnp / system.c

diff --git a/drivers/pnp/system.c b/drivers/pnp/system.c
index 764f3a3106854056d3acec26ce77068908b0eb58..59b90922da8c324529c4d198c23b54211168f23f 100644 (file)
--- a/drivers/pnp/system.c
+++ b/drivers/pnp/system.c
@@ -26,7 +26,7 @@ static void reserve_range(struct pnp_dev *dev, resource_size_t start,
                          resource_size_t end, int port)
 {
        char *regionid;
-       const char *pnpid = dev->dev.bus_id;
+       const char *pnpid = dev_name(&dev->dev);
        struct resource *res;
 
        regionid = kmalloc(16, GFP_KERNEL);