diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-03 18:22:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-03 18:22:51 +0100 |
| commit | 89cab4624a8c0ed81a1b74b6f8c884641cac5b9d (patch) | |
| tree | 3a2f1ae599ee4bae60ccf11cc154d73c210c6388 /drivers/s390/block/scm_blk.h | |
| parent | 2e1cc199fc8666ac5fda200e8a99f1e4dea07175 (diff) | |
| parent | c6f9b1eb0e5df468891eff17f981b76c86f95f3a (diff) | |
ASoC: core: Merge Samsung fixes to avoid trivial context conflict
Merge branch 'fix/samsung' of
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into
asoc-component to resolve trivial conflict
Conflicts:
sound/soc/samsung/i2s.c
Diffstat (limited to 'drivers/s390/block/scm_blk.h')
| -rw-r--r-- | drivers/s390/block/scm_blk.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/s390/block/scm_blk.h b/drivers/s390/block/scm_blk.h index 3c1ccf49464..8b387b32fd6 100644 --- a/drivers/s390/block/scm_blk.h +++ b/drivers/s390/block/scm_blk.h @@ -21,6 +21,7 @@ struct scm_blk_dev { spinlock_t rq_lock; /* guard the request queue */ spinlock_t lock; /* guard the rest of the blockdev */ atomic_t queued_reqs; + enum {SCM_OPER, SCM_WR_PROHIBIT} state; struct list_head finished_requests; #ifdef CONFIG_SCM_BLOCK_CLUSTER_WRITE struct list_head cluster_list; @@ -48,6 +49,7 @@ struct scm_request { int scm_blk_dev_setup(struct scm_blk_dev *, struct scm_device *); void scm_blk_dev_cleanup(struct scm_blk_dev *); +void scm_blk_set_available(struct scm_blk_dev *); void scm_blk_irq(struct scm_device *, void *, int); void scm_request_finish(struct scm_request *); |