git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[media] platform: vivid: Use cec_get_drvdata()
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
platform
/
vivid
/
vivid-cec.c
diff --git
a/drivers/media/platform/vivid/vivid-cec.c
b/drivers/media/platform/vivid/vivid-cec.c
index cb4933592a3cdbba573d80481f8efa7ae76c849e..653f4099f737a0bd49563cd5d969f619a8fd6e2f 100644
(file)
--- a/
drivers/media/platform/vivid/vivid-cec.c
+++ b/
drivers/media/platform/vivid/vivid-cec.c
@@
-135,7
+135,7
@@
static int vivid_cec_adap_log_addr(struct cec_adapter *adap, u8 log_addr)
static int vivid_cec_adap_transmit(struct cec_adapter *adap, u8 attempts,
u32 signal_free_time, struct cec_msg *msg)
{
static int vivid_cec_adap_transmit(struct cec_adapter *adap, u8 attempts,
u32 signal_free_time, struct cec_msg *msg)
{
- struct vivid_dev *dev =
adap->priv
;
+ struct vivid_dev *dev =
cec_get_drvdata(adap)
;
struct vivid_cec_work *cw = kzalloc(sizeof(*cw), GFP_KERNEL);
long delta_jiffies = 0;
struct vivid_cec_work *cw = kzalloc(sizeof(*cw), GFP_KERNEL);
long delta_jiffies = 0;
@@
-166,7
+166,7
@@
static int vivid_cec_adap_transmit(struct cec_adapter *adap, u8 attempts,
static int vivid_received(struct cec_adapter *adap, struct cec_msg *msg)
{
static int vivid_received(struct cec_adapter *adap, struct cec_msg *msg)
{
- struct vivid_dev *dev =
adap->priv
;
+ struct vivid_dev *dev =
cec_get_drvdata(adap)
;
struct cec_msg reply;
u8 dest = cec_msg_destination(msg);
u8 disp_ctl;
struct cec_msg reply;
u8 dest = cec_msg_destination(msg);
u8 disp_ctl;