diff options
| -rw-r--r-- | drivers/mfd/ezx-pcap.c | 2 | ||||
| -rw-r--r-- | include/linux/mfd/ezx-pcap.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c index 43a76c41cfcc..db662e2dcfa5 100644 --- a/drivers/mfd/ezx-pcap.c +++ b/drivers/mfd/ezx-pcap.c | |||
| @@ -202,7 +202,7 @@ static void pcap_isr_work(struct work_struct *work) | |||
| 202 | } | 202 | } |
| 203 | local_irq_enable(); | 203 | local_irq_enable(); |
| 204 | ezx_pcap_write(pcap, PCAP_REG_MSR, pcap->msr); | 204 | ezx_pcap_write(pcap, PCAP_REG_MSR, pcap->msr); |
| 205 | } while (gpio_get_value(irq_to_gpio(pcap->spi->irq))); | 205 | } while (gpio_get_value(pdata->gpio)); |
| 206 | } | 206 | } |
| 207 | 207 | ||
| 208 | static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc) | 208 | static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc) |
diff --git a/include/linux/mfd/ezx-pcap.h b/include/linux/mfd/ezx-pcap.h index 40c372165f3e..32a1b5cfeba1 100644 --- a/include/linux/mfd/ezx-pcap.h +++ b/include/linux/mfd/ezx-pcap.h | |||
| @@ -16,6 +16,7 @@ struct pcap_subdev { | |||
| 16 | struct pcap_platform_data { | 16 | struct pcap_platform_data { |
| 17 | unsigned int irq_base; | 17 | unsigned int irq_base; |
| 18 | unsigned int config; | 18 | unsigned int config; |
| 19 | int gpio; | ||
| 19 | void (*init) (void *); /* board specific init */ | 20 | void (*init) (void *); /* board specific init */ |
| 20 | int num_subdevs; | 21 | int num_subdevs; |
| 21 | struct pcap_subdev *subdevs; | 22 | struct pcap_subdev *subdevs; |
