diff options
| -rw-r--r-- | kernel/irq/chip.c | 7 | ||||
| -rw-r--r-- | kernel/irq/manage.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index b7dd02a99c80..8775dd39ab3d 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c | |||
| @@ -381,6 +381,11 @@ static int compat_irq_set_type(struct irq_data *data, unsigned int type) | |||
| 381 | return data->chip->set_type(data->irq, type); | 381 | return data->chip->set_type(data->irq, type); |
| 382 | } | 382 | } |
| 383 | 383 | ||
| 384 | static int compat_irq_set_wake(struct irq_data *data, unsigned int on) | ||
| 385 | { | ||
| 386 | return data->chip->set_wake(data->irq, on); | ||
| 387 | } | ||
| 388 | |||
| 384 | static void compat_bus_lock(struct irq_data *data) | 389 | static void compat_bus_lock(struct irq_data *data) |
| 385 | { | 390 | { |
| 386 | data->chip->bus_lock(data->irq); | 391 | data->chip->bus_lock(data->irq); |
| @@ -451,6 +456,8 @@ void irq_chip_set_defaults(struct irq_chip *chip) | |||
| 451 | chip->irq_set_affinity = compat_irq_set_affinity; | 456 | chip->irq_set_affinity = compat_irq_set_affinity; |
| 452 | if (chip->set_type) | 457 | if (chip->set_type) |
| 453 | chip->irq_set_type = compat_irq_set_type; | 458 | chip->irq_set_type = compat_irq_set_type; |
| 459 | if (chip->set_wake) | ||
| 460 | chip->irq_set_wake = compat_irq_set_wake; | ||
| 454 | } | 461 | } |
| 455 | 462 | ||
| 456 | static inline void mask_ack_irq(struct irq_desc *desc) | 463 | static inline void mask_ack_irq(struct irq_desc *desc) |
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 3618362b3d8d..644e8d5fa367 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
| @@ -337,8 +337,8 @@ static int set_irq_wake_real(unsigned int irq, unsigned int on) | |||
| 337 | struct irq_desc *desc = irq_to_desc(irq); | 337 | struct irq_desc *desc = irq_to_desc(irq); |
| 338 | int ret = -ENXIO; | 338 | int ret = -ENXIO; |
| 339 | 339 | ||
| 340 | if (desc->irq_data.chip->set_wake) | 340 | if (desc->irq_data.chip->irq_set_wake) |
| 341 | ret = desc->irq_data.chip->set_wake(irq, on); | 341 | ret = desc->irq_data.chip->irq_set_wake(&desc->irq_data, on); |
| 342 | 342 | ||
| 343 | return ret; | 343 | return ret; |
| 344 | } | 344 | } |
