From 6a36ad9d818f2b57d407dfb4aa2717ad62731fbf Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Tue, 23 Oct 2012 15:57:10 -0300 Subject: [PATCH] --- yaml --- r: 357207 b: refs/heads/master c: d486b94b2636ce169f7f2bb1a4a7973843cc72e3 h: refs/heads/master i: 357205: 9787096e6614587c72946aa74149b8d91881c4f9 357203: 43dc6e2924f1c39755155bf666fc9555d62da363 357199: f2d51913cbb74aa8973736ca68e16426307234d8 v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/hdpvr/hdpvr-i2c.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a25c719e73a0..868b34f8f812 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5338c16905ed7e8145861e1dacdd4eadce18f2b9 +refs/heads/master: d486b94b2636ce169f7f2bb1a4a7973843cc72e3 diff --git a/trunk/drivers/media/usb/hdpvr/hdpvr-i2c.c b/trunk/drivers/media/usb/hdpvr/hdpvr-i2c.c index 031cf024304c..6c5054f3f674 100644 --- a/trunk/drivers/media/usb/hdpvr/hdpvr-i2c.c +++ b/trunk/drivers/media/usb/hdpvr/hdpvr-i2c.c @@ -217,8 +217,7 @@ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev) hdpvr_activate_ir(dev); - memcpy(&dev->i2c_adapter, &hdpvr_i2c_adapter_template, - sizeof(struct i2c_adapter)); + dev->i2c_adapter = hdpvr_i2c_adapter_template; dev->i2c_adapter.dev.parent = &dev->udev->dev; i2c_set_adapdata(&dev->i2c_adapter, dev);