diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/cafe_ccic.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c index c149b7d712e5..ea0db819184c 100644 --- a/drivers/media/video/cafe_ccic.c +++ b/drivers/media/video/cafe_ccic.c | |||
@@ -2091,15 +2091,8 @@ static int cafe_pci_probe(struct pci_dev *pdev, | |||
2091 | const struct pci_device_id *id) | 2091 | const struct pci_device_id *id) |
2092 | { | 2092 | { |
2093 | int ret; | 2093 | int ret; |
2094 | u16 classword; | ||
2095 | struct cafe_camera *cam; | 2094 | struct cafe_camera *cam; |
2096 | /* | 2095 | |
2097 | * Make sure we have a camera here - we'll get calls for | ||
2098 | * the other cafe devices as well. | ||
2099 | */ | ||
2100 | pci_read_config_word(pdev, PCI_CLASS_DEVICE, &classword); | ||
2101 | if (classword != PCI_CLASS_MULTIMEDIA_VIDEO) | ||
2102 | return -ENODEV; | ||
2103 | /* | 2096 | /* |
2104 | * Start putting together one of our big camera structures. | 2097 | * Start putting together one of our big camera structures. |
2105 | */ | 2098 | */ |
@@ -2287,8 +2280,8 @@ static int cafe_pci_resume(struct pci_dev *pdev) | |||
2287 | 2280 | ||
2288 | 2281 | ||
2289 | static struct pci_device_id cafe_ids[] = { | 2282 | static struct pci_device_id cafe_ids[] = { |
2290 | { PCI_DEVICE(0x11ab, 0x4100) }, /* Eventual real ID */ | 2283 | { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, |
2291 | { PCI_DEVICE(0x11ab, 0x4102) }, /* Really eventual real ID */ | 2284 | PCI_DEVICE_ID_MARVELL_88ALP01_CCIC) }, |
2292 | { 0, } | 2285 | { 0, } |
2293 | }; | 2286 | }; |
2294 | 2287 | ||