Merge remote-tracking branch 'patjak/master' into my_fixes

This commit is contained in:
Sven Schnelle
2015-11-28 23:11:00 +01:00
10 changed files with 61 additions and 78 deletions

View File

@@ -1,5 +1,5 @@
/*
* Broadcom PCIe 1570 webcam driver
* FacetimeHD camera driver
*
* Copyright (C) 2014 Patrik Jakobsson (patrik.r.jakobsson@gmail.com)
*
@@ -443,7 +443,7 @@ static int fthd_pci_probe(struct pci_dev *pdev,
struct fthd_private *dev_priv;
int ret;
dev_info(&pdev->dev, "Found Broadcom PCIe webcam with device id: %x\n",
dev_info(&pdev->dev, "Found FaceTime HD camera with device id: %x\n",
pdev->device);
dev_priv = kzalloc(sizeof(struct fthd_private), GFP_KERNEL);
@@ -534,26 +534,8 @@ static struct pci_driver fthd_pci_driver = {
#endif
};
static int __init fthd_init(void)
{
int ret = 0;
ret = pci_register_driver(&fthd_pci_driver);
if (ret)
pr_err("Couldn't find any devices (ret=%d)\n", ret);
return ret;
}
static void __exit fthd_exit(void)
{
pci_unregister_driver(&fthd_pci_driver);
}
module_init(fthd_init);
module_exit(fthd_exit);
module_pci_driver(fthd_pci_driver);
MODULE_AUTHOR("Patrik Jakobsson <patrik.r.jakobsson@gmail.com>");
MODULE_DESCRIPTION("Broadcom PCIe 1570 webcam driver");
MODULE_DESCRIPTION("FacetimeHD camera driver");
MODULE_LICENSE("GPL");