From e87a9d72237016e089174030cea8497c979e6549 Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Tue, 23 Oct 2012 15:57:18 -0300 Subject: [PATCH] --- yaml --- r: 357215 b: refs/heads/master c: 01a5cbebce7bca910f50dff19b05177c2c8a8a76 h: refs/heads/master i: 357213: 57587eb99ba7bafd120f669533bf4171ae89b85a 357211: c5db4ce1f5541c1cea4340b5f9e373b87d718b2d 357207: 6a36ad9d818f2b57d407dfb4aa2717ad62731fbf 357199: f2d51913cbb74aa8973736ca68e16426307234d8 357183: f580142959c2e8aacd6e8c6613daf36c8a5d135e v: v3 --- [refs] | 2 +- trunk/drivers/media/pci/ivtv/ivtv-i2c.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 0a597dc45aab..ecb9c5111703 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f05b24536f068c0a5072929fb6c0fb2099d273c +refs/heads/master: 01a5cbebce7bca910f50dff19b05177c2c8a8a76 diff --git a/trunk/drivers/media/pci/ivtv/ivtv-i2c.c b/trunk/drivers/media/pci/ivtv/ivtv-i2c.c index 46e262becb67..a1811054fde4 100644 --- a/trunk/drivers/media/pci/ivtv/ivtv-i2c.c +++ b/trunk/drivers/media/pci/ivtv/ivtv-i2c.c @@ -719,13 +719,10 @@ int init_ivtv_i2c(struct ivtv *itv) return -ENODEV; } if (itv->options.newi2c > 0) { - memcpy(&itv->i2c_adap, &ivtv_i2c_adap_hw_template, - sizeof(struct i2c_adapter)); + itv->i2c_adap = ivtv_i2c_adap_hw_template; } else { - memcpy(&itv->i2c_adap, &ivtv_i2c_adap_template, - sizeof(struct i2c_adapter)); - memcpy(&itv->i2c_algo, &ivtv_i2c_algo_template, - sizeof(struct i2c_algo_bit_data)); + itv->i2c_adap = ivtv_i2c_adap_template; + itv->i2c_algo = ivtv_i2c_algo_template; } itv->i2c_algo.udelay = itv->options.i2c_clock_period / 2; itv->i2c_algo.data = itv; @@ -735,8 +732,7 @@ int init_ivtv_i2c(struct ivtv *itv) itv->instance); i2c_set_adapdata(&itv->i2c_adap, &itv->v4l2_dev); - memcpy(&itv->i2c_client, &ivtv_i2c_client_template, - sizeof(struct i2c_client)); + itv->i2c_client = ivtv_i2c_client_template; itv->i2c_client.adapter = &itv->i2c_adap; itv->i2c_adap.dev.parent = &itv->pdev->dev;