5 files changed, 20 insertions, 10 deletions

diff --git a/sound/i2c/cs8427.c b/sound/i2c/cs8427.c
index 9c3d361accfb..020a5d512472 100644
--- a/sound/i2c/cs8427.c
+++ b/sound/i2c/cs8427.c
@@ -314,7 +314,8 @@ static void snd_cs8427_reset(struct snd_i2c_device *cs8427)
         unsigned long end_time;
         int data, aes3input = 0;
 
-        snd_assert(cs8427, return);
+        if (snd_BUG_ON(!cs8427))
+                return;
         chip = cs8427->private_data;
         snd_i2c_lock(cs8427->bus);
         if ((chip->regmap[CS8427_REG_CLOCKSOURCE] & CS8427_RXDAES3INPUT) ==
@@ -526,7 +527,8 @@ int snd_cs8427_iec958_build(struct snd_i2c_device *cs8427,
         unsigned int idx;
         int err;
 
-        snd_assert(play_substream && cap_substream, return -EINVAL);
+        if (snd_BUG_ON(!play_substream || !cap_substream))
+                return -EINVAL;
         for (idx = 0; idx < ARRAY_SIZE(snd_cs8427_iec958_controls); idx++) {
                 kctl = snd_ctl_new1(&snd_cs8427_iec958_controls[idx], cs8427);
                 if (kctl == NULL)
@@ -543,7 +545,8 @@ int snd_cs8427_iec958_build(struct snd_i2c_device *cs8427,
 
         chip->playback.substream = play_substream;
         chip->capture.substream = cap_substream;
-        snd_assert(chip->playback.pcm_ctl, return -EIO);
+        if (snd_BUG_ON(!chip->playback.pcm_ctl))
+                return -EIO;
         return 0;
 }
 
@@ -553,7 +556,8 @@ int snd_cs8427_iec958_active(struct snd_i2c_device *cs8427, int active)
 {
         struct cs8427 *chip;
 
-        snd_assert(cs8427, return -ENXIO);
+        if (snd_BUG_ON(!cs8427))
+                return -ENXIO;
         chip = cs8427->private_data;
         if (active)
                 memcpy(chip->playback.pcm_status,
@@ -573,7 +577,8 @@ int snd_cs8427_iec958_pcm(struct snd_i2c_device *cs8427, unsigned int rate)
         char *status;
         int err, reset;
 
-        snd_assert(cs8427, return -ENXIO);
+        if (snd_BUG_ON(!cs8427))
+                return -ENXIO;
         chip = cs8427->private_data;
         status = chip->playback.pcm_status;
         snd_i2c_lock(cs8427->bus);
diff --git a/sound/i2c/i2c.c b/sound/i2c/i2c.c
index b1e74e40cba0..5c0c77dd01c3 100644
--- a/sound/i2c/i2c.c
+++ b/sound/i2c/i2c.c
@@ -49,7 +49,8 @@ static int snd_i2c_bus_free(struct snd_i2c_bus *bus)
         struct snd_i2c_bus *slave;
         struct snd_i2c_device *device;
 
-        snd_assert(bus != NULL, return -EINVAL);
+        if (snd_BUG_ON(!bus))
+                return -EINVAL;
         while (!list_empty(&bus->devices)) {
                 device = snd_i2c_device(bus->devices.next);
                 snd_i2c_device_free(device);
@@ -113,7 +114,8 @@ int snd_i2c_device_create(struct snd_i2c_bus *bus, const char *name,
         struct snd_i2c_device *device;
 
         *rdevice = NULL;
-        snd_assert(bus != NULL, return -EINVAL);
+        if (snd_BUG_ON(!bus))
+                return -EINVAL;
         device = kzalloc(sizeof(*device), GFP_KERNEL);
         if (device == NULL)
                 return -ENOMEM;
diff --git a/sound/i2c/l3/uda1341.c b/sound/i2c/l3/uda1341.c
index 1f4942ea1414..9840eb43648d 100644
--- a/sound/i2c/l3/uda1341.c
+++ b/sound/i2c/l3/uda1341.c
@@ -771,7 +771,8 @@ int __init snd_chip_uda1341_mixer_new(struct snd_card *card, struct l3_client **
         struct l3_client *clnt;
         int idx, err;
 
-        snd_assert(card != NULL, return -EINVAL);
+        if (snd_BUG_ON(!card))
+                return -EINVAL;
 
         clnt = kzalloc(sizeof(*clnt), GFP_KERNEL);
         if (clnt == NULL)
diff --git a/sound/i2c/other/ak4114.c b/sound/i2c/other/ak4114.c
index d20d893b3b60..0341451f814c 100644
--- a/sound/i2c/other/ak4114.c
+++ b/sound/i2c/other/ak4114.c
@@ -475,7 +475,8 @@ int snd_ak4114_build(struct ak4114 *ak4114,
         unsigned int idx;
         int err;
 
-        snd_assert(cap_substream, return -EINVAL);
+        if (snd_BUG_ON(!cap_substream))
+                return -EINVAL;
         ak4114->playback_substream = ply_substream;
         ak4114->capture_substream = cap_substream;
         for (idx = 0; idx < AK4114_CONTROLS; idx++) {
diff --git a/sound/i2c/other/ak4117.c b/sound/i2c/other/ak4117.c
index f350835ade96..2cad2d612518 100644
--- a/sound/i2c/other/ak4117.c
+++ b/sound/i2c/other/ak4117.c
@@ -431,7 +431,8 @@ int snd_ak4117_build(struct ak4117 *ak4117, struct snd_pcm_substream *cap_substr
         unsigned int idx;
         int err;
 
-        snd_assert(cap_substream, return -EINVAL);
+        if (snd_BUG_ON(!cap_substream))
+                return -EINVAL;
         ak4117->substream = cap_substream;
         for (idx = 0; idx < AK4117_CONTROLS; idx++) {
                 kctl = snd_ctl_new1(&snd_ak4117_iec958_controls[idx], ak4117);