2 files changed, 7 insertions, 3 deletions

diff --git a/sound/isa/ad1816a/ad1816a.c b/sound/isa/ad1816a/ad1816a.c
index 68f1260b5602..77524244a846 100644
--- a/sound/isa/ad1816a/ad1816a.c
+++ b/sound/isa/ad1816a/ad1816a.c
@@ -83,8 +83,10 @@ static struct pnp_card_device_id snd_ad1816a_pnpids[] = {
         { .id = "MDK1605", .devs = { { .id = "ADS7180" }, { .id = "ADS7181" } } },
         /* Shark Predator ISA - added by Ken Arromdee */
         { .id = "SMM7180", .devs = { { .id = "ADS7180" }, { .id = "ADS7181" } } },
-        /* Analog Devices AD1816A - Terratec AudioSystem EWS64S */
+        /* Analog Devices AD1816A - Terratec AudioSystem EWS64 S */
         { .id = "TER1112", .devs = { { .id = "ADS7180" }, { .id = "ADS7181" } } },
+        /* Analog Devices AD1816A - Terratec AudioSystem EWS64 S */
+        { .id = "TER1112", .devs = { { .id = "TER1100" }, { .id = "TER1101" } } },
         /* Analog Devices AD1816A - Terratec Base 64 */
         { .id = "TER1411", .devs = { { .id = "ADS7180" }, { .id = "ADS7181" } } },
         /* end */
diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c
index 4b8dfe2e3dcb..3bfca7c59baf 100644
--- a/sound/isa/ad1816a/ad1816a_lib.c
+++ b/sound/isa/ad1816a/ad1816a_lib.c
@@ -394,7 +394,8 @@ static int snd_ad1816a_timer_open(struct snd_timer *timer)
 
 static unsigned long snd_ad1816a_timer_resolution(struct snd_timer *timer)
 {
-        snd_assert(timer != NULL, return 0);
+        if (snd_BUG_ON(!timer))
+                return 0;
 
         return 10000;
 }
@@ -961,7 +962,8 @@ int __devinit snd_ad1816a_mixer(struct snd_ad1816a *chip)
         unsigned int idx;
         int err;
 
-        snd_assert(chip != NULL && chip->card != NULL, return -EINVAL);
+        if (snd_BUG_ON(!chip || !chip->card))
+                return -EINVAL;
 
         card = chip->card;