Merge tag 'binfmt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb...

[karo-tx-linux.git] / sound / pci / ctxfi / xfi.c

diff --git a/sound/pci/ctxfi/xfi.c b/sound/pci/ctxfi/xfi.c
index 8f8b566a1b35ea0c8d32755b0d6240d351787922..f2f32779de986ff9d50b6853f024113d79ef9752 100644 (file)
--- a/sound/pci/ctxfi/xfi.c
+++ b/sound/pci/ctxfi/xfi.c
@@ -76,17 +76,18 @@ ct_card_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
        if (err)
                return err;
        if ((reference_rate != 48000) && (reference_rate != 44100)) {
-               printk(KERN_ERR "ctxfi: Invalid reference_rate value %u!!!\n",
-                      reference_rate);
-               printk(KERN_ERR "ctxfi: The valid values for reference_rate "
-                      "are 48000 and 44100, Value 48000 is assumed.\n");
+               dev_err(card->dev,
+                       "Invalid reference_rate value %u!!!\n",
+                       reference_rate);
+               dev_err(card->dev,
+                       "The valid values for reference_rate are 48000 and 44100, Value 48000 is assumed.\n");
                reference_rate = 48000;
        }
        if ((multiple != 1) && (multiple != 2) && (multiple != 4)) {
-               printk(KERN_ERR "ctxfi: Invalid multiple value %u!!!\n",
-                      multiple);
-               printk(KERN_ERR "ctxfi: The valid values for multiple are "
-                      "1, 2 and 4, Value 2 is assumed.\n");
+               dev_err(card->dev, "Invalid multiple value %u!!!\n",
+                       multiple);
+               dev_err(card->dev,
+                       "The valid values for multiple are 1, 2 and 4, Value 2 is assumed.\n");
                multiple = 2;
        }
        err = ct_atc_create(card, pci, reference_rate, multiple,