diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-01-26 15:53:41 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-26 15:53:41 +0300 |
| commit | 7533185eeefd087d5472422181ae8edf75118213 (patch) | |
| tree | 6a62ccb019668215f70bcc9876a795548f57262a /drivers/reset | |
| parent | b4b33f9d64c3edcdcbea874acdc1e9626fd961f1 (diff) | |
| parent | 0767e95bb96d7fdddcd590fb809e6975d93aebc5 (diff) | |
| download | linux-7533185eeefd087d5472422181ae8edf75118213.tar.xz | |
Merge branch 'for-linus' into for-next
Sync with the latest 3.19-rc state for applying other ALSA sequencer
core fixes.
Diffstat (limited to 'drivers/reset')
| -rw-r--r-- | drivers/reset/reset-sunxi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c index eebc52cb6984..3d95c87160b3 100644 --- a/drivers/reset/reset-sunxi.c +++ b/drivers/reset/reset-sunxi.c @@ -102,6 +102,8 @@ static int sunxi_reset_init(struct device_node *np) goto err_alloc; } + spin_lock_init(&data->lock); + data->rcdev.owner = THIS_MODULE; data->rcdev.nr_resets = size * 32; data->rcdev.ops = &sunxi_reset_ops; @@ -157,6 +159,8 @@ static int sunxi_reset_probe(struct platform_device *pdev) if (IS_ERR(data->membase)) return PTR_ERR(data->membase); + spin_lock_init(&data->lock); + data->rcdev.owner = THIS_MODULE; data->rcdev.nr_resets = resource_size(res) * 32; data->rcdev.ops = &sunxi_reset_ops; |