diff options
| -rw-r--r-- | drivers/mfd/cpcap-regacc.c | 6 | ||||
| -rw-r--r-- | drivers/mfd/m4sensorhub-irq.c | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/mfd/cpcap-regacc.c b/drivers/mfd/cpcap-regacc.c index 1a616014188..e85b241ab61 100644 --- a/drivers/mfd/cpcap-regacc.c +++ b/drivers/mfd/cpcap-regacc.c @@ -316,7 +316,8 @@ int cpcap_regacc_read(struct cpcap_device *cpcap, enum cpcap_reg reg, { int retval = -EINVAL; struct spi_device *spi = cpcap->spi; - +/* Temporarily disable SPI for CPCAP driver for minnow bringup */ +return 0; if (IS_CPCAP(reg) && (value_ptr != 0)) { mutex_lock(®_access); @@ -338,7 +339,8 @@ int cpcap_regacc_write(struct cpcap_device *cpcap, unsigned short old_value = 0; struct cpcap_platform_data *data; struct spi_device *spi = cpcap->spi; - +/* Temporarily disable SPI for CPCAP driver for minnow bringup */ +return 0; data = (struct cpcap_platform_data *)spi->controller_data; if (IS_CPCAP(reg) && diff --git a/drivers/mfd/m4sensorhub-irq.c b/drivers/mfd/m4sensorhub-irq.c index 7a87c95bcdd..cd0d1fa59d2 100644 --- a/drivers/mfd/m4sensorhub-irq.c +++ b/drivers/mfd/m4sensorhub-irq.c @@ -221,6 +221,9 @@ int m4sensorhub_irq_init(struct m4sensorhub_data *m4sensorhub) retval = 0; goto done; +#ifdef CONFIG_DEBUG_FS +err_disa_irq: +#endif disable_irq_wake(i2c->irq); err_free_irq: free_irq(i2c->irq, data); |