summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2017-09-22 01:23:56 +0200
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-12-14 15:52:58 +0100
commit45392ff6881dbe56d41ef0b17c2e576065f8ffa1 (patch)
tree311ad235151c0e7805b2faeacad4852b6b2f01b5 /drivers/media
parentmedia: dvb_ca_en50221: sanity check slot number from userspace (diff)
downloadlinux-45392ff6881dbe56d41ef0b17c2e576065f8ffa1.tar.xz
linux-45392ff6881dbe56d41ef0b17c2e576065f8ffa1.zip
media: bt8xx: Fix err 'bt878_probe()'
This is odd to call 'pci_disable_device()' in an error path before a coresponding successful 'pci_enable_device()'. Return directly instead. Fixes: 77e0be12100a ("V4L/DVB (4176): Bug-fix: Fix memory overflow") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/pci/bt8xx/bt878.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/pci/bt8xx/bt878.c b/drivers/media/pci/bt8xx/bt878.c
index a5f52137d306..d4bc78b4fcb5 100644
--- a/drivers/media/pci/bt8xx/bt878.c
+++ b/drivers/media/pci/bt8xx/bt878.c
@@ -422,8 +422,7 @@ static int bt878_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
bt878_num);
if (bt878_num >= BT878_MAX) {
printk(KERN_ERR "bt878: Too many devices inserted\n");
- result = -ENOMEM;
- goto fail0;
+ return -ENOMEM;
}
if (pci_enable_device(dev))
return -EIO;