diff options
| author | HIRANO Takahito <hiranotaka@zng.info> | 2011-05-01 02:29:40 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-20 09:29:33 -0300 |
| commit | cae72c7c63fd4a8f20efc001108f12f34076c17b (patch) | |
| tree | 6ca97c89217396077d8146b90fdb10a3142719b7 /drivers/media/dvb/pt1 | |
| parent | 59983439c09f0d319cd288d27c0f70cf8764e09a (diff) | |
| download | kernel_samsung_aries-cae72c7c63fd4a8f20efc001108f12f34076c17b.zip kernel_samsung_aries-cae72c7c63fd4a8f20efc001108f12f34076c17b.tar.gz kernel_samsung_aries-cae72c7c63fd4a8f20efc001108f12f34076c17b.tar.bz2 | |
[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/pt1')
| -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 0486919..b81df5f 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) 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 @@ err_pt1_disable_ram: 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); |