diff options
author | Dave Airlie <airlied@redhat.com> | 2017-12-19 12:37:24 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-12-19 12:37:24 +0100 |
commit | 6b7dcb536e3535444c39286333f10d06d2f44fb5 (patch) | |
tree | 6a4c1e30e5900626e506d46b100d21a2fcd59003 /drivers/media/usb/pwc | |
parent | Merge tag 'drm-misc-next-2017-12-14' of git://anongit.freedesktop.org/drm/drm... (diff) | |
parent | Linux 4.15-rc4 (diff) | |
download | linux-6b7dcb536e3535444c39286333f10d06d2f44fb5.tar.xz linux-6b7dcb536e3535444c39286333f10d06d2f44fb5.zip |
BackMerge tag 'v4.15-rc4' into drm-next
Linux 4.15-rc4
Daniel requested it to fix some messy conflicts.
Diffstat (limited to 'drivers/media/usb/pwc')
-rw-r--r-- | drivers/media/usb/pwc/pwc-dec23.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/usb/pwc/pwc-dec23.c b/drivers/media/usb/pwc/pwc-dec23.c index 3792fedff951..1283b3bd9800 100644 --- a/drivers/media/usb/pwc/pwc-dec23.c +++ b/drivers/media/usb/pwc/pwc-dec23.c @@ -649,11 +649,10 @@ static void DecompressBand23(struct pwc_dec23_private *pdec, } /** - * * Uncompress a pwc23 buffer. - * - * src: raw data - * dst: image output + * @pdev: pointer to pwc device's internal struct + * @src: raw data + * @dst: image output */ void pwc_dec23_decompress(struct pwc_device *pdev, const void *src, |