Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'hwmon-for-linus-v4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fix from Guenter Roeck:
"Fix up error path in xgene driver"
* tag 'hwmon-for-linus-v4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (xgene) Fix up error handling path mixup in 'xgene_hwmon_probe()'
+11
-8
+11
-8
drivers/hwmon/xgene-hwmon.c
+11
-8
drivers/hwmon/xgene-hwmon.c
···
630
630
sizeof(struct slimpro_resp_msg) * ASYNC_MSG_FIFO_SIZE,
631
631
GFP_KERNEL);
632
632
if (rc)
633
-
goto out_mbox_free;
633
+
return -ENOMEM;
634
634
635
635
INIT_WORK(&ctx->workq, xgene_hwmon_evt_work);
636
636
···
646
646
if (IS_ERR(ctx->mbox_chan)) {
647
647
dev_err(&pdev->dev,
648
648
"SLIMpro mailbox channel request failed\n");
649
-
return -ENODEV;
649
+
rc = -ENODEV;
650
+
goto out_mbox_free;
650
651
}
651
652
} else {
652
653
struct acpi_pcct_hw_reduced *cppc_ss;
···
655
654
if (device_property_read_u32(&pdev->dev, "pcc-channel",
656
655
&ctx->mbox_idx)) {
657
656
dev_err(&pdev->dev, "no pcc-channel property\n");
658
-
return -ENODEV;
657
+
rc = -ENODEV;
658
+
goto out_mbox_free;
659
659
}
660
660
661
661
cl->rx_callback = xgene_hwmon_pcc_rx_cb;
···
664
662
if (IS_ERR(ctx->mbox_chan)) {
665
663
dev_err(&pdev->dev,
666
664
"PPC channel request failed\n");
667
-
return -ENODEV;
665
+
rc = -ENODEV;
666
+
goto out_mbox_free;
668
667
}
669
668
670
669
/*
···
678
675
if (!cppc_ss) {
679
676
dev_err(&pdev->dev, "PPC subspace not found\n");
680
677
rc = -ENODEV;
681
-
goto out_mbox_free;
678
+
goto out;
682
679
}
683
680
684
681
if (!ctx->mbox_chan->mbox->txdone_irq) {
685
682
dev_err(&pdev->dev, "PCC IRQ not supported\n");
686
683
rc = -ENODEV;
687
-
goto out_mbox_free;
684
+
goto out;
688
685
}
689
686
690
687
/*
···
699
696
} else {
700
697
dev_err(&pdev->dev, "Failed to get PCC comm region\n");
701
698
rc = -ENODEV;
702
-
goto out_mbox_free;
699
+
goto out;
703
700
}
704
701
705
702
if (!ctx->pcc_comm_addr) {
706
703
dev_err(&pdev->dev,
707
704
"Failed to ioremap PCC comm region\n");
708
705
rc = -ENOMEM;
709
-
goto out_mbox_free;
706
+
goto out;
710
707
}
711
708
712
709
/*