aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cafe_ccic.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/cafe_ccic.c')
-rw-r--r--drivers/media/video/cafe_ccic.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index e9994c81df66..fc9497bdd322 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -2096,15 +2096,8 @@ static int cafe_pci_probe(struct pci_dev *pdev,
2096 const struct pci_device_id *id) 2096 const struct pci_device_id *id)
2097{ 2097{
2098 int ret; 2098 int ret;
2099 u16 classword;
2100 struct cafe_camera *cam; 2099 struct cafe_camera *cam;
2101 /* 2100
2102 * Make sure we have a camera here - we'll get calls for
2103 * the other cafe devices as well.
2104 */
2105 pci_read_config_word(pdev, PCI_CLASS_DEVICE, &classword);
2106 if (classword != PCI_CLASS_MULTIMEDIA_VIDEO)
2107 return -ENODEV;
2108 /* 2101 /*
2109 * Start putting together one of our big camera structures. 2102 * Start putting together one of our big camera structures.
2110 */ 2103 */
@@ -2292,8 +2285,8 @@ static int cafe_pci_resume(struct pci_dev *pdev)
2292 2285
2293 2286
2294static struct pci_device_id cafe_ids[] = { 2287static struct pci_device_id cafe_ids[] = {
2295 { PCI_DEVICE(0x11ab, 0x4100) }, /* Eventual real ID */ 2288 { PCI_DEVICE(PCI_VENDOR_ID_MARVELL,
2296 { PCI_DEVICE(0x11ab, 0x4102) }, /* Really eventual real ID */ 2289 PCI_DEVICE_ID_MARVELL_88ALP01_CCIC) },
2297 { 0, } 2290 { 0, }
2298}; 2291};
2299 2292