These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / mailbox / pcc.c

diff --git a/kernel/drivers/mailbox/pcc.c b/kernel/drivers/mailbox/pcc.c
index 7e91d68..45d85ae 100644 (file)
--- a/kernel/drivers/mailbox/pcc.c
+++ b/kernel/drivers/mailbox/pcc.c
@@ -122,7 +122,7 @@ struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl,
         */
        chan = get_pcc_channel(subspace_id);
 
-       if (!chan || chan->cl) {
+       if (IS_ERR(chan) || chan->cl) {
                dev_err(dev, "Channel not found for idx: %d\n", subspace_id);
                return ERR_PTR(-EBUSY);
        }
@@ -198,7 +198,7 @@ static int pcc_send_data(struct mbox_chan *chan, void *data)
        return 0;
 }
 
-static struct mbox_chan_ops pcc_chan_ops = {
+static const struct mbox_chan_ops pcc_chan_ops = {
        .send_data = pcc_send_data,
 };
 
@@ -352,4 +352,10 @@ static int __init pcc_init(void)
 
        return 0;
 }
-device_initcall(pcc_init);
+
+/*
+ * Make PCC init postcore so that users of this mailbox
+ * such as the ACPI Processor driver have it available
+ * at their init.
+ */
+postcore_initcall(pcc_init);