summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-11-05 15:01:47 +0100
committerTakashi Iwai <tiwai@suse.de>2013-11-06 08:34:58 +0100
commit025be74c1db44158dd3cfe43b89ba16266d01062 (patch)
treef0a3d01b60d3932f947fd72f5464a69d0212bf78
parentALSA: ctxfi: Use WARN_ON() instead of BUG_ON() (diff)
downloadlinux-025be74c1db44158dd3cfe43b89ba16266d01062.tar.xz
linux-025be74c1db44158dd3cfe43b89ba16266d01062.zip
ALSA: ps3: Use WARN_ON() instead of BUG_ON()
BUG_ON() is rather useless for debugging as it leads to panic(). Use WARN_ON() and handle the error cases accordingly. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/ppc/snd_ps3.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c
index 8c7dcbe0118d..ebb76f2d90d7 100644
--- a/sound/ppc/snd_ps3.c
+++ b/sound/ppc/snd_ps3.c
@@ -933,8 +933,10 @@ static int snd_ps3_driver_probe(struct ps3_system_bus_device *dev)
int i, ret;
u64 lpar_addr, lpar_size;
- BUG_ON(!firmware_has_feature(FW_FEATURE_PS3_LV1));
- BUG_ON(dev->match_id != PS3_MATCH_ID_SOUND);
+ if (WARN_ON(!firmware_has_feature(FW_FEATURE_PS3_LV1)))
+ return -ENODEV;
+ if (WARN_ON(dev->match_id != PS3_MATCH_ID_SOUND))
+ return -ENODEV;
the_card.ps3_dev = dev;