[PATCH] Recent i2c changes broke matroxfb

The 'name' member of i2c clients & adapters moved again back to the
i2c_* from generic device.

Thanks to Petri Koistinen for bringing this to my attention.

diff --git a/drivers/video/matrox/i2c-matroxfb.c b/drivers/video/matrox/i2c-matroxfb.c
index 77d3c62c74b66618aac155f93567924058b02ab2..58fc6b1022d91cdd2966878f62ddbad89db0c30d 100644 (file)
--- a/drivers/video/matrox/i2c-matroxfb.c
+++ b/drivers/video/matrox/i2c-matroxfb.c
@@ -111,7 +111,7 @@ static int i2c_bus_reg(struct i2c_bit_adapter* b, struct matrox_fb_info* minfo,
        b->mask.data = data;
        b->mask.clock = clock;
        b->adapter = matrox_i2c_adapter_template;
-       snprintf(b->adapter.dev.name, DEVICE_NAME_SIZE, name,
+       snprintf(b->adapter.name, DEVICE_NAME_SIZE, name,
                minfo->fbcon.node);
        i2c_set_adapdata(&b->adapter, b);
        b->adapter.algo_data = &b->bac;

diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c
index cf8f69c30ca41788ab2a1ad82b20d98286af638c..70c5a8167ce3deb3c33172713f7606569e9cb4f6 100644 (file)
--- a/drivers/video/matrox/matroxfb_maven.c
+++ b/drivers/video/matrox/matroxfb_maven.c
@@ -1255,7 +1255,7 @@ static int maven_detect_client(struct i2c_adapter* adapter, int address, int kin
        new_client->adapter = adapter;
        new_client->driver = &maven_driver;
        new_client->flags = 0;
-       strcpy(new_client->dev.name, "maven client");
+       strcpy(new_client->name, "maven client");
        if ((err = i2c_attach_client(new_client)))
                goto ERROR3;
        err = maven_init_client(new_client);