diff --git a/drivers/misc/slimport_anx7808/slimport.c b/drivers/misc/slimport_anx7808/slimport.c
index cba05476efe..3d7cbf33f29 100644
--- a/drivers/misc/slimport_anx7808/slimport.c
+++ b/drivers/misc/slimport_anx7808/slimport.c
@@ -509,7 +509,8 @@ static int anx7808_i2c_probe(struct i2c_client *client,
 
 	anx7808->pdata = client->dev.platform_data;
 	i2c_set_clientdata(client, anx7808);
-	memcpy(&anx7808_client, &client, sizeof(client));
+	/* memcpy(&anx7808_client, &client, sizeof(client)); */
+	anx7808_client = client;
 
 	mutex_init(&anx7808->lock);
 	spin_lock_init(&anx7808->pdata->lock);
@@ -616,6 +617,7 @@ err2:
 err1:
 	anx7808_free_gpio(anx7808);
 err0:
+	anx7808_client = NULL;
 	kfree(anx7808);
 exit:
 	return ret;