Merge branch 'v4l_for_linus' into staging/for_v3.9
* v4l_for_linus: (464 commits) [media] uvcvideo: Set error_idx properly for S_EXT_CTRLS failures [media] uvcvideo: Cleanup leftovers of partial revert [media] uvcvideo: Return -EACCES when trying to set a read-only control Linux 3.8-rc3 mm: reinstante dropped pmd_trans_splitting() check cred: Remove tgcred pointer from struct cred drm/ttm: fix fence locking in ttm_buffer_object_transfer ARM: clps711x: Fix bad merge of clockevents setup ARM: highbank: save and restore L2 cache and GIC on suspend ARM: highbank: add a power request clear ARM: highbank: fix secondary boot and hotplug ARM: highbank: fix typos with hignbank in power request functions ARM: dts: fix highbank cpu mpidr values ARM: dts: add device_type prop to cpu nodes on Calxeda platforms drm/prime: drop reference on imported dma-buf come from gem xen/netfront: improve truesize tracking ARM: mx5: Fix MX53 flexcan2 clock ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array sctp: fix Kconfig bug in default cookie hmac selection EDAC: Cleanup device deregistering path ... Conflicts: drivers/media/pci/dm1105/dm1105.c drivers/media/platform/soc_camera/mx2_camera.c
这个提交包含在:
@@ -1728,8 +1728,7 @@ static int meye_resume(struct pci_dev *pdev)
|
||||
}
|
||||
#endif
|
||||
|
||||
static int __devinit meye_probe(struct pci_dev *pcidev,
|
||||
const struct pci_device_id *ent)
|
||||
static int meye_probe(struct pci_dev *pcidev, const struct pci_device_id *ent)
|
||||
{
|
||||
struct v4l2_device *v4l2_dev = &meye.v4l2_dev;
|
||||
int ret = -EBUSY;
|
||||
@@ -1889,7 +1888,7 @@ outnotdev:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void __devexit meye_remove(struct pci_dev *pcidev)
|
||||
static void meye_remove(struct pci_dev *pcidev)
|
||||
{
|
||||
video_unregister_device(meye.vdev);
|
||||
|
||||
@@ -1935,7 +1934,7 @@ static struct pci_driver meye_driver = {
|
||||
.name = "meye",
|
||||
.id_table = meye_pci_tbl,
|
||||
.probe = meye_probe,
|
||||
.remove = __devexit_p(meye_remove),
|
||||
.remove = meye_remove,
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = meye_suspend,
|
||||
.resume = meye_resume,
|
||||
|
在新工单中引用
屏蔽一个用户