diff options
| -rw-r--r-- | drivers/video/omap2/hdcp/hdcp.h | 3 | ||||
| -rw-r--r-- | drivers/video/omap2/hdcp/hdcp_lib.c | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/omap2/hdcp/hdcp.h b/drivers/video/omap2/hdcp/hdcp.h index 0d210a2..e22a588 100644 --- a/drivers/video/omap2/hdcp/hdcp.h +++ b/drivers/video/omap2/hdcp/hdcp.h @@ -98,7 +98,6 @@ struct hdcp_wait_control { #include <linux/slab.h> #include <linux/fs.h> -#define DEBUG /* Comment to remove debug printk */ #define _9032_AUTO_RI_ /* Auto Ri mode */ #define _9032_BCAP_ /* BCAP polling */ #undef _9032_AN_STOP_FIX_ @@ -355,7 +354,7 @@ extern struct hdcp_sha_in sha_input; #undef DBG -#ifdef DEBUG +#ifdef HDCP_DEBUG #define DBG(format, ...) \ printk(KERN_DEBUG "HDCP: " format "\n", ## __VA_ARGS__) #else diff --git a/drivers/video/omap2/hdcp/hdcp_lib.c b/drivers/video/omap2/hdcp/hdcp_lib.c index 73bbe9e..5b92aff 100644 --- a/drivers/video/omap2/hdcp/hdcp_lib.c +++ b/drivers/video/omap2/hdcp/hdcp_lib.c @@ -484,7 +484,7 @@ void hdcp_lib_set_encryption(enum encryption_state enc_state) spin_unlock_irqrestore(&hdcp.spinlock, flags); - DBG("Encryption state changed: %s hdcp_ctrl: %02x", + pr_info("HDCP: Encryption state changed: %s hdcp_ctrl: %02x", enc_state == HDCP_ENC_OFF ? "OFF" : "ON", RD_REG_32(hdcp.hdmi_wp_base_addr + HDMI_IP_CORE_SYSTEM, @@ -831,6 +831,7 @@ int hdcp_lib_step2(void) #ifdef _9032_AUTO_RI_ hdcp_lib_auto_ri_check(true); #endif - return HDCP_OK; } + + return status; } |