diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-04 15:24:02 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-04 15:24:02 -0400 |
| commit | db0a2901a32c44510d7d429358d017143a649a70 (patch) | |
| tree | 4e4e41cf2e27aa4940f9c0711ca2a3bf7557a805 /drivers/media/radio/radio-maestro.c | |
| parent | d210baf53b699fc61aa891c177b71d7082d3b957 (diff) | |
| parent | 4cce1655b26a4df1e619b2aa3d2eea1b7a6e906c (diff) | |
Merge branch 'fixes_stg' of ../git_old into fixes
Diffstat (limited to 'drivers/media/radio/radio-maestro.c')
| -rw-r--r-- | drivers/media/radio/radio-maestro.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c index 0ada1c697e8a..9ef0a763eeb7 100644 --- a/drivers/media/radio/radio-maestro.c +++ b/drivers/media/radio/radio-maestro.c | |||
| @@ -409,8 +409,7 @@ static int __devinit maestro_probe(struct pci_dev *pdev, | |||
| 409 | video_set_drvdata(maestro_radio_inst, radio_unit); | 409 | video_set_drvdata(maestro_radio_inst, radio_unit); |
| 410 | pci_set_drvdata(pdev, maestro_radio_inst); | 410 | pci_set_drvdata(pdev, maestro_radio_inst); |
| 411 | 411 | ||
| 412 | retval = video_register_device(maestro_radio_inst, VFL_TYPE_RADIO, | 412 | retval = video_register_device(maestro_radio_inst, VFL_TYPE_RADIO, radio_nr); |
| 413 | radio_nr); | ||
| 414 | if (retval) { | 413 | if (retval) { |
| 415 | printk(KERN_ERR "can't register video device!\n"); | 414 | printk(KERN_ERR "can't register video device!\n"); |
| 416 | goto errfr1; | 415 | goto errfr1; |