diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2014-12-08 11:33:24 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-12-08 11:33:24 +0100 |
| commit | 77de61c3975da6f2200935c341e84018ece6ce36 (patch) | |
| tree | 36508cf93ef62a80c988fa18c86eda1274e03877 /arch/powerpc/kernel/eeh_sysfs.c | |
| parent | ALSA: usb-audio: Don't resubmit pending URBs at MIDI error recovery (diff) | |
| parent | ALSA: atmel_abdac: Add missing clock prepare (diff) | |
| download | linux-dev-77de61c3975da6f2200935c341e84018ece6ce36.tar.xz linux-dev-77de61c3975da6f2200935c341e84018ece6ce36.zip | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'arch/powerpc/kernel/eeh_sysfs.c')
| -rw-r--r-- | arch/powerpc/kernel/eeh_sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/eeh_sysfs.c b/arch/powerpc/kernel/eeh_sysfs.c index f19b1e5cb060..1ceecdda810b 100644 --- a/arch/powerpc/kernel/eeh_sysfs.c +++ b/arch/powerpc/kernel/eeh_sysfs.c @@ -65,7 +65,7 @@ static ssize_t eeh_pe_state_show(struct device *dev, return -ENODEV; state = eeh_ops->get_state(edev->pe, NULL); - return sprintf(buf, "%0x08x %0x08x\n", + return sprintf(buf, "0x%08x 0x%08x\n", state, edev->pe->state); } |