Merge tag 'platform-drivers-x86-v4.14-2' of git://git.infradead.org/linux-platform...

[mirror_ubuntu-bionic-kernel.git] / drivers / platform / x86 / intel_mid_powerbtn.c

diff --git a/drivers/platform/x86/intel_mid_powerbtn.c b/drivers/platform/x86/intel_mid_powerbtn.c
index 871cfa682519c2256126edae36dffefc9537ed8b..d79fbf924b136823987011664d385e1bdceb927d 100644 (file)
--- a/drivers/platform/x86/intel_mid_powerbtn.c
+++ b/drivers/platform/x86/intel_mid_powerbtn.c
@@ -108,13 +108,13 @@ static irqreturn_t mid_pb_isr(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static struct mid_pb_ddata mfld_ddata = {
+static const struct mid_pb_ddata mfld_ddata = {
        .mirqlvl1_addr  = INTEL_MSIC_IRQLVL1MSK,
        .pbstat_addr    = INTEL_MSIC_PBSTATUS,
        .pbstat_mask    = MSIC_PB_LEVEL,
 };
 
-static struct mid_pb_ddata mrfld_ddata = {
+static const struct mid_pb_ddata mrfld_ddata = {
        .mirqlvl1_addr  = BCOVE_IRQLVL1MSK,
        .pbstat_addr    = BCOVE_PBSTATUS,
        .pbstat_mask    = BCOVE_PB_LEVEL,
@@ -142,8 +142,10 @@ static int mid_pb_probe(struct platform_device *pdev)
        if (!id)
                return -ENODEV;
 
-       if (irq < 0)
-               return -EINVAL;
+       if (irq < 0) {
+               dev_err(&pdev->dev, "Failed to get IRQ: %d\n", irq);
+               return irq;
+       }
 
        input = devm_input_allocate_device(&pdev->dev);
        if (!input)