ALSA: pci: Simplify with dma_set_mask_and_coherent()

[sfrench/cifs-2.6.git] / sound / pci / es1968.c

diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index 34332d008b27d0a68be11ff0fa6e004ef34e4d33..747fa69bb1c90c4454af94fe9cf0780ca42e0eda 100644 (file)
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -2668,8 +2668,7 @@ static int snd_es1968_create(struct snd_card *card,
        if ((err = pci_enable_device(pci)) < 0)
                return err;
        /* check, if we can restrict PCI DMA transfers to 28 bits */
-       if (dma_set_mask(&pci->dev, DMA_BIT_MASK(28)) < 0 ||
-           dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(28)) < 0) {
+       if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(28))) {
                dev_err(card->dev,
                        "architecture does not support 28bit PCI busmaster DMA\n");
                pci_disable_device(pci);
@@ -2768,7 +2767,7 @@ static int snd_es1968_create(struct snd_card *card,
                if (!snd_tea575x_init(&chip->tea, THIS_MODULE)) {
                        dev_info(card->dev, "detected TEA575x radio type %s\n",
                                   get_tea575x_gpio(chip)->name);
-                       strlcpy(chip->tea.card, get_tea575x_gpio(chip)->name,
+                       strscpy(chip->tea.card, get_tea575x_gpio(chip)->name,
                                sizeof(chip->tea.card));
                        break;
                }