Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

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

diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index 3b48aef8f4ebeeaa345a17e82e1ff0a6f38f7b0a..da1c9909eb44abbd5ed59602e3be4faf9fe99718 100644 (file)
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -198,8 +198,7 @@ int pnp_add_card(struct pnp_card *card)
        card->dev.release = &pnp_release_card;
        error = device_register(&card->dev);
        if (error) {
-               pnp_err("sysfs failure, card '%s' will be unavailable",
-                       card->dev.bus_id);
+               dev_err(&card->dev, "could not register (err=%d)\n", error);
                return error;
        }