Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[deliverable/linux.git] / sound / core / control_compat.c

diff --git a/sound/core/control_compat.c b/sound/core/control_compat.c
index 2bb95a7a8809fed3a042e8796b5431ce2afbee46..b9c0910fb8c4ead97559c7f9c1737e76b2d5cf7f 100644 (file)
--- a/sound/core/control_compat.c
+++ b/sound/core/control_compat.c
@@ -247,7 +247,7 @@ static int copy_ctl_value_from_user(struct snd_card *card,
        } else {
                size = get_elem_size(type, count);
                if (size < 0) {
-                       printk(KERN_ERR "snd_ioctl32_ctl_elem_value: unknown type %d\n", type);
+                       dev_err(card->dev, "snd_ioctl32_ctl_elem_value: unknown type %d\n", type);
                        return -EINVAL;
                }
                if (copy_from_user(data->value.bytes.data,