|
@@ -116,6 +116,7 @@ struct ads7846 {
|
|
|
// FIXME remove "irq_disabled"
|
|
|
unsigned irq_disabled:1; /* P: lock */
|
|
|
unsigned disabled:1;
|
|
|
+ unsigned is_suspended:1;
|
|
|
|
|
|
int (*filter)(void *data, int data_idx, int *val);
|
|
|
void *filter_data;
|
|
@@ -203,7 +204,7 @@ static void ads7846_disable(struct ads7846 *ts);
|
|
|
static int device_suspended(struct device *dev)
|
|
|
{
|
|
|
struct ads7846 *ts = dev_get_drvdata(dev);
|
|
|
- return dev->power.power_state.event != PM_EVENT_ON || ts->disabled;
|
|
|
+ return ts->is_suspended || ts->disabled;
|
|
|
}
|
|
|
|
|
|
static int ads7846_read12_ser(struct device *dev, unsigned command)
|
|
@@ -795,7 +796,7 @@ static int ads7846_suspend(struct spi_device *spi, pm_message_t message)
|
|
|
|
|
|
spin_lock_irq(&ts->lock);
|
|
|
|
|
|
- spi->dev.power.power_state = message;
|
|
|
+ ts->is_suspended = 1;
|
|
|
ads7846_disable(ts);
|
|
|
|
|
|
spin_unlock_irq(&ts->lock);
|
|
@@ -810,7 +811,7 @@ static int ads7846_resume(struct spi_device *spi)
|
|
|
|
|
|
spin_lock_irq(&ts->lock);
|
|
|
|
|
|
- spi->dev.power.power_state = PMSG_ON;
|
|
|
+ ts->is_suspended = 0;
|
|
|
ads7846_enable(ts);
|
|
|
|
|
|
spin_unlock_irq(&ts->lock);
|
|
@@ -872,7 +873,6 @@ static int __devinit ads7846_probe(struct spi_device *spi)
|
|
|
}
|
|
|
|
|
|
dev_set_drvdata(&spi->dev, ts);
|
|
|
- spi->dev.power.power_state = PMSG_ON;
|
|
|
|
|
|
ts->spi = spi;
|
|
|
ts->input = input_dev;
|