Merge tag 'f2fs-for-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeu...

[linux-2.6-microblaze.git] / drivers / media / cec / cec-pin.c

diff --git a/drivers/media/cec/cec-pin.c b/drivers/media/cec/cec-pin.c
index e2aa5d6..b48dfe8 100644 (file)
--- a/drivers/media/cec/cec-pin.c
+++ b/drivers/media/cec/cec-pin.c
@@ -20,6 +20,7 @@
 #include <linux/sched/types.h>
 
 #include <media/cec-pin.h>
+#include "cec-pin-priv.h"
 
 /* All timings are in microseconds */
 
@@ -796,7 +797,7 @@ struct cec_adapter *cec_pin_allocate_adapter(const struct cec_pin_ops *pin_ops,
                            caps | CEC_CAP_MONITOR_ALL | CEC_CAP_MONITOR_PIN,
                            CEC_MAX_LOG_ADDRS);
 
-       if (PTR_ERR_OR_ZERO(adap)) {
+       if (IS_ERR(adap)) {
                kfree(pin);
                return adap;
        }