Merge branches 'clk-qcom', 'clk-socfpga', 'clk-mediatek', 'clk-lmk' and 'clk-x86...

[linux-2.6-microblaze.git] / sound / drivers / portman2x4.c

diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
index 2f4514e..52a6567 100644 (file)
--- a/sound/drivers/portman2x4.c
+++ b/sound/drivers/portman2x4.c
@@ -749,7 +749,8 @@ static int snd_portman_probe(struct platform_device *pdev)
                goto free_pardev;
        }
 
-       if ((err = portman_create(card, pardev, &pm)) < 0) {
+       err = portman_create(card, pardev, &pm);
+       if (err < 0) {
                snd_printd("Cannot create main component\n");
                goto release_pardev;
        }
@@ -762,19 +763,22 @@ static int snd_portman_probe(struct platform_device *pdev)
                goto __err;
        }
        
-       if ((err = snd_portman_rawmidi_create(card)) < 0) {
+       err = snd_portman_rawmidi_create(card);
+       if (err < 0) {
                snd_printd("Creating Rawmidi component failed\n");
                goto __err;
        }
 
        /* init device */
-       if ((err = portman_device_init(pm)) < 0)
+       err = portman_device_init(pm);
+       if (err < 0)
                goto __err;
 
        platform_set_drvdata(pdev, card);
 
        /* At this point card will be usable */
-       if ((err = snd_card_register(card)) < 0) {
+       err = snd_card_register(card);
+       if (err < 0) {
                snd_printd("Cannot register card\n");
                goto __err;
        }
@@ -831,7 +835,8 @@ static int __init snd_portman_module_init(void)
 {
        int err;
 
-       if ((err = platform_driver_register(&snd_portman_driver)) < 0)
+       err = platform_driver_register(&snd_portman_driver);
+       if (err < 0)
                return err;
 
        if (parport_register_driver(&portman_parport_driver) != 0) {