Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Hering <ohering@suse.de>2019-11-08 08:20:46 +0100
committerOlaf Hering <ohering@suse.de>2019-11-08 08:20:46 +0100
commitf6e25c2e50f0fbc59018195fdd1fa84e88250c5b (patch)
treed4841a387af6cd0b99bdaaab54182ad78c0d0e3c
parentb2766b7c8810bdde9713a2b3369d5a21e4cea4d5 (diff)
parentbb90c1cd97cdcd7b96b40047e046ecf7d89c4ef1 (diff)
Merge remote-tracking branch 'kerncvs/SLE12-SP4' into SLE12-SP4-AZURE
-rw-r--r--arch/powerpc/kernel/fadump.c5
-rw-r--r--drivers/input/rmi4/rmi_driver.c6
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
index eec40de5978c..0e5c33d89a98 100644
--- a/arch/powerpc/kernel/fadump.c
+++ b/arch/powerpc/kernel/fadump.c
@@ -1693,11 +1693,6 @@ static void fadump_init_files(void)
*/
int __init setup_fadump(void)
{
- if (!fw_dump.fadump_supported && fw_dump.fadump_enabled) {
- printk(KERN_ERR "Firmware-assisted dump is not supported on"
- " this hardware\n");
- }
-
if (!fw_dump.fadump_supported)
return 0;
diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
index bae46816a3b3..997ccae7ee05 100644
--- a/drivers/input/rmi4/rmi_driver.c
+++ b/drivers/input/rmi4/rmi_driver.c
@@ -165,7 +165,7 @@ static int rmi_process_interrupt_requests(struct rmi_device *rmi_dev)
}
mutex_lock(&data->irq_mutex);
- bitmap_and(data->irq_status, data->irq_status, data->fn_irq_bits,
+ bitmap_and(data->irq_status, data->irq_status, data->current_irq_mask,
data->irq_count);
/*
* At this point, irq_status has all bits that are set in the
@@ -412,8 +412,6 @@ static int rmi_driver_set_irq_bits(struct rmi_device *rmi_dev,
bitmap_copy(data->current_irq_mask, data->new_irq_mask,
data->num_of_irq_regs);
- bitmap_or(data->fn_irq_bits, data->fn_irq_bits, mask, data->irq_count);
-
error_unlock:
mutex_unlock(&data->irq_mutex);
return error;
@@ -427,8 +425,6 @@ static int rmi_driver_clear_irq_bits(struct rmi_device *rmi_dev,
struct device *dev = &rmi_dev->dev;
mutex_lock(&data->irq_mutex);
- bitmap_andnot(data->fn_irq_bits,
- data->fn_irq_bits, mask, data->irq_count);
bitmap_andnot(data->new_irq_mask,
data->current_irq_mask, mask, data->irq_count);