diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-09-22 18:31:08 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-09-22 18:31:08 +0200 |
| commit | 3d98c21d064bfbb8c6fddc659471acb4950320fa (patch) | |
| tree | a506fbe4cca3616f328cdf761a45d0a09ce38237 /arch/powerpc/lib/code-patching.c | |
| parent | 99df18b31db389ec6abc8ad5415c14e7bb752b58 (diff) | |
| parent | ddfb43f3881edb47aa0083651ad31983cdc42c33 (diff) | |
| download | talos-op-linux-3d98c21d064bfbb8c6fddc659471acb4950320fa.tar.gz talos-op-linux-3d98c21d064bfbb8c6fddc659471acb4950320fa.zip | |
Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.7
Lots and lots of driver specific cleanups and enhancements but the only
substantial framework feature this time round is the compressed API
binding:
- Addition of ASoC bindings for the compressed API, used by the mid-x86
drivers.
- Lots of cleanups and API refreshes for CODEC drivers and DaVinci.
- Conversion of OMAP to dmaengine.
- New machine driver for Wolfson Microelectronics Bells.
- New CODEC driver for Wolfson Microelectronics WM0010.
Diffstat (limited to 'arch/powerpc/lib/code-patching.c')
| -rw-r--r-- | arch/powerpc/lib/code-patching.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c index dd223b3eb333..17e5b2364312 100644 --- a/arch/powerpc/lib/code-patching.c +++ b/arch/powerpc/lib/code-patching.c @@ -20,7 +20,7 @@ int patch_instruction(unsigned int *addr, unsigned int instr) { int err; - err = __put_user(instr, addr); + __put_user_size(instr, addr, 4, err); if (err) return err; asm ("dcbst 0, %0; sync; icbi 0,%0; sync; isync" : : "r" (addr)); |
