diff options
author | Mauro Carvalho Chehab | 2016-05-30 23:16:14 +0200 |
---|---|---|
committer | Mauro Carvalho Chehab | 2016-05-30 23:16:14 +0200 |
commit | 6a2cf60b3e6341a3163d3cac3f4bede126c2e894 (patch) | |
tree | 390f8883f38dde653cfdf5f2a91b7e69c83cae4e /drivers/media/platform | |
parent | Merge tag 'v4.6' into patchwork (diff) | |
parent | Linux 4.7-rc1 (diff) | |
download | kernel-qcow2-linux-6a2cf60b3e6341a3163d3cac3f4bede126c2e894.tar.gz kernel-qcow2-linux-6a2cf60b3e6341a3163d3cac3f4bede126c2e894.tar.xz kernel-qcow2-linux-6a2cf60b3e6341a3163d3cac3f4bede126c2e894.zip |
Merge tag 'v4.7-rc1' into patchwork
Linux 4.7-rc1
* tag 'v4.7-rc1': (10534 commits)
Linux 4.7-rc1
hash_string: Fix zero-length case for !DCACHE_WORD_ACCESS
Rename other copy of hash_string to hashlen_string
hpfs: implement the show_options method
affs: fix remount failure when there are no options changed
hpfs: fix remount failure when there are no options changed
fs: fix binfmt_aout.c build error
h8300: Add <asm/hash.h>
microblaze: Add <asm/hash.h>
m68k: Add <asm/hash.h>
<linux/hash.h>: Add support for architecture-specific functions
fs/namei.c: Improve dcache hash function
Eliminate bad hash multipliers from hash_32() and hash_64()
Change hash_64() return value to 32 bits
<linux/sunrpc/svcauth.h>: Define hash_str() in terms of hashlen_string()
fs/namei.c: Add hashlen_string() function
Pull out string hash to <linux/stringhash.h>
Revert "platform/chrome: chromeos_laptop: Add Leon Touch"
i2c: dev: use after free in detach
MIPS: Add missing FROZEN hotplug notifier transitions
...
Diffstat (limited to 'drivers/media/platform')
-rw-r--r-- | drivers/media/platform/s5p-tv/mixer_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/s5p-tv/mixer_drv.c b/drivers/media/platform/s5p-tv/mixer_drv.c index 5ef67774971d..8a5d19469ddc 100644 --- a/drivers/media/platform/s5p-tv/mixer_drv.c +++ b/drivers/media/platform/s5p-tv/mixer_drv.c @@ -146,7 +146,7 @@ int mxr_power_get(struct mxr_device *mdev) /* returning 1 means that power is already enabled, * so zero success be returned */ - if (IS_ERR_VALUE(ret)) + if (ret < 0) return ret; return 0; } |