Merge branch 'fixes-v5.14' into fixes

[linux-2.6-microblaze.git] / sound / ppc / keywest.c

diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c
index a891510..6e5daae 100644 (file)
--- a/sound/ppc/keywest.c
+++ b/sound/ppc/keywest.c
@@ -114,7 +114,8 @@ int snd_pmac_tumbler_post_init(void)
        if (!keywest_ctx || !keywest_ctx->client)
                return -ENXIO;
 
-       if ((err = keywest_ctx->init_client(keywest_ctx)) < 0) {
+       err = keywest_ctx->init_client(keywest_ctx);
+       if (err < 0) {
                snd_printk(KERN_ERR "tumbler: %i :cannot initialize the MCS\n", err);
                return err;
        }
@@ -136,7 +137,8 @@ int snd_pmac_keywest_init(struct pmac_keywest *i2c)
 
        keywest_ctx = i2c;
 
-       if ((err = i2c_add_driver(&keywest_driver))) {
+       err = i2c_add_driver(&keywest_driver);
+       if (err) {
                snd_printk(KERN_ERR "cannot register keywest i2c driver\n");
                i2c_put_adapter(adap);
                return err;