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

[kvmfornfv.git] / kernel / drivers / hsi / clients / nokia-modem.c

diff --git a/kernel/drivers/hsi/clients/nokia-modem.c b/kernel/drivers/hsi/clients/nokia-modem.c
index bbb1923..7f82c91 100644 (file)
--- a/kernel/drivers/hsi/clients/nokia-modem.c
+++ b/kernel/drivers/hsi/clients/nokia-modem.c
@@ -112,7 +112,8 @@ static int nokia_modem_gpio_probe(struct device *dev)
        modem->gpio_amount = gpio_count;
 
        for (i = 0; i < gpio_count; i++) {
-               modem->gpios[i].gpio = devm_gpiod_get_index(dev, NULL, i);
+               modem->gpios[i].gpio = devm_gpiod_get_index(dev, NULL, i,
+                                                           GPIOD_OUT_LOW);
                if (IS_ERR(modem->gpios[i].gpio)) {
                        dev_err(dev, "Could not get gpio %d\n", i);
                        return PTR_ERR(modem->gpios[i].gpio);
@@ -125,10 +126,6 @@ static int nokia_modem_gpio_probe(struct device *dev)
                        return err;
                }
 
-               err = gpiod_direction_output(modem->gpios[i].gpio, 0);
-               if (err)
-                       return err;
-
                err = gpiod_export(modem->gpios[i].gpio, 0);
                if (err)
                        return err;
@@ -208,7 +205,7 @@ static int nokia_modem_probe(struct device *dev)
 
        err = device_attach(&modem->ssi_protocol->device);
        if (err == 0) {
-               dev_err(dev, "Missing ssi-protocol driver\n");
+               dev_dbg(dev, "Missing ssi-protocol driver\n");
                err = -EPROBE_DEFER;
                goto error3;
        } else if (err < 0) {
@@ -231,7 +228,7 @@ static int nokia_modem_probe(struct device *dev)
 
        err = device_attach(&modem->cmt_speech->device);
        if (err == 0) {
-               dev_err(dev, "Missing cmt-speech driver\n");
+               dev_dbg(dev, "Missing cmt-speech driver\n");
                err = -EPROBE_DEFER;
                goto error4;
        } else if (err < 0) {