Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / sound / ppc / snd_ps3.c

diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c
index 8c7dcbe0118dbce433c0dd7850f5ad467d90a8d4..ebb76f2d90d790175cbb35b93ffa1213f258a299 100644 (file)
--- 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;