diff options
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/v4l2-device.h | 8 | ||||
| -rw-r--r-- | include/media/videobuf-dma-sg.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h index 9bf4ccc93dbf..55e41afd95ef 100644 --- a/include/media/v4l2-device.h +++ b/include/media/v4l2-device.h | |||
| @@ -94,16 +94,16 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd); | |||
| 94 | /* Call the specified callback for all subdevs matching grp_id (if 0, then | 94 | /* Call the specified callback for all subdevs matching grp_id (if 0, then |
| 95 | match them all). Ignore any errors. Note that you cannot add or delete | 95 | match them all). Ignore any errors. Note that you cannot add or delete |
| 96 | a subdev while walking the subdevs list. */ | 96 | a subdev while walking the subdevs list. */ |
| 97 | #define v4l2_device_call_all(dev, grp_id, o, f, args...) \ | 97 | #define v4l2_device_call_all(dev, grpid, o, f, args...) \ |
| 98 | __v4l2_device_call_subdevs(dev, \ | 98 | __v4l2_device_call_subdevs(dev, \ |
| 99 | !(grp_id) || sd->grp_id == (grp_id), o, f , ##args) | 99 | !(grpid) || sd->grp_id == (grpid), o, f , ##args) |
| 100 | 100 | ||
| 101 | /* Call the specified callback for all subdevs matching grp_id (if 0, then | 101 | /* Call the specified callback for all subdevs matching grp_id (if 0, then |
| 102 | match them all). If the callback returns an error other than 0 or | 102 | match them all). If the callback returns an error other than 0 or |
| 103 | -ENOIOCTLCMD, then return with that error code. Note that you cannot | 103 | -ENOIOCTLCMD, then return with that error code. Note that you cannot |
| 104 | add or delete a subdev while walking the subdevs list. */ | 104 | add or delete a subdev while walking the subdevs list. */ |
| 105 | #define v4l2_device_call_until_err(dev, grp_id, o, f, args...) \ | 105 | #define v4l2_device_call_until_err(dev, grpid, o, f, args...) \ |
| 106 | __v4l2_device_call_subdevs_until_err(dev, \ | 106 | __v4l2_device_call_subdevs_until_err(dev, \ |
| 107 | !(grp_id) || sd->grp_id == (grp_id), o, f , ##args) | 107 | !(grpid) || sd->grp_id == (grpid), o, f , ##args) |
| 108 | 108 | ||
| 109 | #endif | 109 | #endif |
diff --git a/include/media/videobuf-dma-sg.h b/include/media/videobuf-dma-sg.h index 90edd22d343c..dda47f0082e9 100644 --- a/include/media/videobuf-dma-sg.h +++ b/include/media/videobuf-dma-sg.h | |||
| @@ -49,7 +49,7 @@ struct scatterlist* videobuf_pages_to_sg(struct page **pages, int nr_pages, | |||
| 49 | * does memory allocation too using vmalloc_32(). | 49 | * does memory allocation too using vmalloc_32(). |
| 50 | * | 50 | * |
| 51 | * videobuf_dma_*() | 51 | * videobuf_dma_*() |
| 52 | * see Documentation/DMA-mapping.txt, these functions to | 52 | * see Documentation/PCI/PCI-DMA-mapping.txt, these functions to |
| 53 | * basically the same. The map function does also build a | 53 | * basically the same. The map function does also build a |
| 54 | * scatterlist for the buffer (and unmap frees it ...) | 54 | * scatterlist for the buffer (and unmap frees it ...) |
| 55 | * | 55 | * |