From 47410538e14082e09f6e13f6f9bd1671f65879cf Mon Sep 17 00:00:00 2001
From: HIRANO Takahito <hiranotaka@zng.info>
Date: Sun, 1 May 2011 02:29:40 -0300
Subject: [PATCH] --- yaml --- r: 250228 b: refs/heads/master c:
 cae72c7c63fd4a8f20efc001108f12f34076c17b h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/media/dvb/pt1/pt1.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0f6aefa403ba..68f6feab5655 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59983439c09f0d319cd288d27c0f70cf8764e09a
+refs/heads/master: cae72c7c63fd4a8f20efc001108f12f34076c17b
diff --git a/trunk/drivers/media/dvb/pt1/pt1.c b/trunk/drivers/media/dvb/pt1/pt1.c
index 0486919c1d0f..b81df5fafe26 100644
--- a/trunk/drivers/media/dvb/pt1/pt1.c
+++ b/trunk/drivers/media/dvb/pt1/pt1.c
@@ -1090,6 +1090,7 @@ pt1_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	i2c_adap->algo = &pt1_i2c_algo;
 	i2c_adap->algo_data = NULL;
 	i2c_adap->dev.parent = &pdev->dev;
+	strcpy(i2c_adap->name, DRIVER_NAME);
 	i2c_set_adapdata(i2c_adap, pt1);
 	ret = i2c_add_adapter(i2c_adap);
 	if (ret < 0)
@@ -1156,10 +1157,10 @@ pt1_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	pt1->power = 0;
 	pt1->reset = 1;
 	pt1_update_power(pt1);
-err_pt1_cleanup_adapters:
-	pt1_cleanup_adapters(pt1);
 err_i2c_del_adapter:
 	i2c_del_adapter(i2c_adap);
+err_pt1_cleanup_adapters:
+	pt1_cleanup_adapters(pt1);
 err_kfree:
 	pci_set_drvdata(pdev, NULL);
 	kfree(pt1);