diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-02 08:21:54 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-02 08:21:54 +0200 |
| commit | 7f5d8f711687fb6ad39ece9dd8e76dc6b196ac5c (patch) | |
| tree | f11fd2349981d5c86cfcaf11029946d18cdcb5f7 /drivers/iio/imu | |
| parent | staging: rtl8188eu: remove whitespace - coding style (diff) | |
| parent | Linux 4.18-rc3 (diff) | |
| download | linux-dev-7f5d8f711687fb6ad39ece9dd8e76dc6b196ac5c.tar.xz linux-dev-7f5d8f711687fb6ad39ece9dd8e76dc6b196ac5c.zip | |
Merge 4.18-rc3 into staging-next
We want the staging/iio fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/imu')
| -rw-r--r-- | drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c index de68e83fc52d..0f6efe913b5f 100644 --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c @@ -968,6 +968,8 @@ int inv_mpu_core_probe(struct regmap *regmap, int irq, const char *name, } irq_type = irqd_get_trigger_type(desc); + if (!irq_type) + irq_type = IRQF_TRIGGER_RISING; if (irq_type == IRQF_TRIGGER_RISING) st->irq_mask = INV_MPU6050_ACTIVE_HIGH; else if (irq_type == IRQF_TRIGGER_FALLING) |