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);