These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / sound / pci / lx6464es / lx6464es.c

diff --git a/kernel/sound/pci/lx6464es/lx6464es.c b/kernel/sound/pci/lx6464es/lx6464es.c
index 601315a..8b8e2e5 100644 (file)
--- a/kernel/sound/pci/lx6464es/lx6464es.c
+++ b/kernel/sound/pci/lx6464es/lx6464es.c
@@ -57,13 +57,13 @@ static const char card_name[] = "LX6464ES";
 #define PCI_DEVICE_ID_PLX_LX6464ES             PCI_DEVICE_ID_PLX_9056
 
 static const struct pci_device_id snd_lx6464es_ids[] = {
-       { PCI_DEVICE(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_LX6464ES),
-         .subvendor = PCI_VENDOR_ID_DIGIGRAM,
-         .subdevice = PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_SERIAL_SUBSYSTEM
+       { PCI_DEVICE_SUB(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_LX6464ES,
+                        PCI_VENDOR_ID_DIGIGRAM,
+                        PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_SERIAL_SUBSYSTEM),
        },                      /* LX6464ES */
-       { PCI_DEVICE(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_LX6464ES),
-         .subvendor = PCI_VENDOR_ID_DIGIGRAM,
-         .subdevice = PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_CAE_SERIAL_SUBSYSTEM
+       { PCI_DEVICE_SUB(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_LX6464ES,
+                        PCI_VENDOR_ID_DIGIGRAM,
+                        PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_CAE_SERIAL_SUBSYSTEM),
        },                      /* LX6464ES-CAE */
        { 0, },
 };
@@ -234,8 +234,8 @@ static int lx_pcm_open(struct snd_pcm_substream *substream)
 
        /* the clock rate cannot be changed */
        board_rate = chip->board_sample_rate;
-       err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_RATE,
-                                          board_rate, board_rate);
+       err = snd_pcm_hw_constraint_single(runtime, SNDRV_PCM_HW_PARAM_RATE,
+                                          board_rate);
 
        if (err < 0) {
                dev_warn(chip->card->dev, "could not constrain periods\n");
@@ -412,9 +412,9 @@ static int lx_pcm_hw_free(struct snd_pcm_substream *substream)
        err = snd_pcm_lib_free_pages(substream);
 
        if (is_capture)
-               chip->capture_stream.stream = 0;
+               chip->capture_stream.stream = NULL;
        else
-               chip->playback_stream.stream = 0;
+               chip->playback_stream.stream = NULL;
 
 exit:
        mutex_unlock(&chip->setup_mutex);
@@ -981,7 +981,7 @@ static int snd_lx6464es_create(struct snd_card *card,
        pci_set_master(pci);
 
        /* check if we can restrict PCI DMA transfers to 32 bits */
-       err = pci_set_dma_mask(pci, DMA_BIT_MASK(32));
+       err = dma_set_mask(&pci->dev, DMA_BIT_MASK(32));
        if (err < 0) {
                dev_err(card->dev,
                        "architecture does not support 32bit PCI busmaster DMA\n");