diff options
author | HIRANO Takahito <hiranotaka@zng.info> | 2011-05-01 01:29:40 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-20 08:29:33 -0400 |
commit | cae72c7c63fd4a8f20efc001108f12f34076c17b (patch) | |
tree | 6ca97c89217396077d8146b90fdb10a3142719b7 /drivers/media/dvb | |
parent | 59983439c09f0d319cd288d27c0f70cf8764e09a (diff) |
[media] Fix panic on loading earth-pt1
Signed-off-by: HIRANO Takahito <hiranotaka@zng.info>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/pt1/pt1.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/dvb/pt1/pt1.c b/drivers/media/dvb/pt1/pt1.c index 0486919c1d0f..b81df5fafe26 100644 --- a/drivers/media/dvb/pt1/pt1.c +++ b/drivers/media/dvb/pt1/pt1.c | |||
@@ -1090,6 +1090,7 @@ pt1_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1090 | i2c_adap->algo = &pt1_i2c_algo; | 1090 | i2c_adap->algo = &pt1_i2c_algo; |
1091 | i2c_adap->algo_data = NULL; | 1091 | i2c_adap->algo_data = NULL; |
1092 | i2c_adap->dev.parent = &pdev->dev; | 1092 | i2c_adap->dev.parent = &pdev->dev; |
1093 | strcpy(i2c_adap->name, DRIVER_NAME); | ||
1093 | i2c_set_adapdata(i2c_adap, pt1); | 1094 | i2c_set_adapdata(i2c_adap, pt1); |
1094 | ret = i2c_add_adapter(i2c_adap); | 1095 | ret = i2c_add_adapter(i2c_adap); |
1095 | if (ret < 0) | 1096 | if (ret < 0) |
@@ -1156,10 +1157,10 @@ err_pt1_disable_ram: | |||
1156 | pt1->power = 0; | 1157 | pt1->power = 0; |
1157 | pt1->reset = 1; | 1158 | pt1->reset = 1; |
1158 | pt1_update_power(pt1); | 1159 | pt1_update_power(pt1); |
1159 | err_pt1_cleanup_adapters: | ||
1160 | pt1_cleanup_adapters(pt1); | ||
1161 | err_i2c_del_adapter: | 1160 | err_i2c_del_adapter: |
1162 | i2c_del_adapter(i2c_adap); | 1161 | i2c_del_adapter(i2c_adap); |
1162 | err_pt1_cleanup_adapters: | ||
1163 | pt1_cleanup_adapters(pt1); | ||
1163 | err_kfree: | 1164 | err_kfree: |
1164 | pci_set_drvdata(pdev, NULL); | 1165 | pci_set_drvdata(pdev, NULL); |
1165 | kfree(pt1); | 1166 | kfree(pt1); |