Merge branch 'topic/misc' into for-linus

* topic/misc:
  ALSA: sgio2audio.c: clean up checking
  ALSA: burgundy: timeout message is off by one.
  ALSA: bt87x - Add a quirk entry for Askey Computer Corp. MagicTView'99
  ALSA: parisc/harmony: fix printk format warning
  ALSA: keywest: Get rid of useless i2c_device_name() macro

5 files changed, 7 insertions, 10 deletions

diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c
index 66f3b48ceafc..e497525bc11b 100644
--- a/sound/mips/sgio2audio.c
+++ b/sound/mips/sgio2audio.c
@@ -619,8 +619,7 @@ static int snd_sgio2audio_pcm_hw_params(struct snd_pcm_substream *substream,
 /* hw_free callback */
 static int snd_sgio2audio_pcm_hw_free(struct snd_pcm_substream *substream)
 {
-        if (substream->runtime->dma_area)
-                vfree(substream->runtime->dma_area);
+        vfree(substream->runtime->dma_area);
         substream->runtime->dma_area = NULL;
         return 0;
 }
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
index 6055fd6d3b38..63ae0f9aeaf5 100644
--- a/sound/parisc/harmony.c
+++ b/sound/parisc/harmony.c
@@ -935,7 +935,7 @@ snd_harmony_create(struct snd_card *card,
         h->iobase = ioremap_nocache(padev->hpa.start, HARMONY_SIZE);
         if (h->iobase == NULL) {
                 printk(KERN_ERR PFX "unable to remap hpa 0x%lx\n",
-                       padev->hpa.start);
+                       (unsigned long)padev->hpa.start);
                 err = -EBUSY;
                 goto free_and_ret;
         }
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index ce3f2e90f4d7..24585c6c6d01 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -810,6 +810,8 @@ static struct pci_device_id snd_bt87x_ids[] = {
         BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x107d, 0x6606, GENERIC),
         /* Voodoo TV 200 */
         BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x121a, 0x3000, GENERIC),
+        /* Askey Computer Corp. MagicTView'99 */
+        BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x144f, 0x3000, GENERIC),
         /* AVerMedia Studio No. 103, 203, ...? */
         BT_DEVICE(PCI_DEVICE_ID_BROOKTREE_878, 0x1461, 0x0003, AVPHONE98),
         /* Prolink PixelView PV-M4900 */
diff --git a/sound/ppc/burgundy.c b/sound/ppc/burgundy.c
index 45a76297c38d..d2c0a4e987ae 100644
--- a/sound/ppc/burgundy.c
+++ b/sound/ppc/burgundy.c
@@ -46,12 +46,12 @@ snd_pmac_burgundy_extend_wait(struct snd_pmac *chip)
         timeout = 50;
         while (!(in_le32(&chip->awacs->codec_stat) & MASK_EXTEND) && timeout--)
                 udelay(1);
-        if (! timeout)
+        if (timeout < 0)
                 printk(KERN_DEBUG "burgundy_extend_wait: timeout #1\n");
         timeout = 50;
         while ((in_le32(&chip->awacs->codec_stat) & MASK_EXTEND) && timeout--)
                 udelay(1);
-        if (! timeout)
+        if (timeout < 0)
                 printk(KERN_DEBUG "burgundy_extend_wait: timeout #2\n");
 }
 
diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c
index a5afb2682e7f..b2e2aac22114 100644
--- a/sound/ppc/keywest.c
+++ b/sound/ppc/keywest.c
@@ -33,10 +33,6 @@
 static struct pmac_keywest *keywest_ctx;
 
 
-#ifndef i2c_device_name
-#define i2c_device_name(x)      ((x)->name)
-#endif
-
 static int keywest_probe(struct i2c_client *client,
                          const struct i2c_device_id *id)
 {
@@ -56,7 +52,7 @@ static int keywest_attach_adapter(struct i2c_adapter *adapter)
         if (! keywest_ctx)
                 return -EINVAL;
 
-        if (strncmp(i2c_device_name(adapter), "mac-io", 6))
+        if (strncmp(adapter->name, "mac-io", 6))
                 return 0; /* ignored */
 
         memset(&info, 0, sizeof(struct i2c_board_info));