diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2012-01-08 11:29:19 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-16 11:07:29 -0200 |
| commit | 56ae24aad8f9e25dfef995c3e898e5f394cf0beb (patch) | |
| tree | 2ac5f9df9453057eef01f577647101101fae08d1 /drivers/media/video/pwc/pwc-dec1.c | |
| parent | 54d3fb3b11a7c38b112585e54b7af7cb3faa5c91 (diff) | |
| download | op-kernel-dev-56ae24aad8f9e25dfef995c3e898e5f394cf0beb.zip op-kernel-dev-56ae24aad8f9e25dfef995c3e898e5f394cf0beb.tar.gz | |
[media] pwc: Make decoder data part of the main pwc struct
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/pwc/pwc-dec1.c')
| -rw-r--r-- | drivers/media/video/pwc/pwc-dec1.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/media/video/pwc/pwc-dec1.c b/drivers/media/video/pwc/pwc-dec1.c index be0e02c..bac0d83 100644 --- a/drivers/media/video/pwc/pwc-dec1.c +++ b/drivers/media/video/pwc/pwc-dec1.c @@ -22,19 +22,11 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "pwc-dec1.h" +#include "pwc.h" -int pwc_dec1_init(struct pwc_device *pwc, int type, int release, void *buffer) +void pwc_dec1_init(struct pwc_device *pdev, void *buffer) { - struct pwc_dec1_private *pdec; + struct pwc_dec1_private *pdec = &pdev->dec1; - if (pwc->decompress_data == NULL) { - pdec = kmalloc(sizeof(struct pwc_dec1_private), GFP_KERNEL); - if (pdec == NULL) - return -ENOMEM; - pwc->decompress_data = pdec; - } - pdec = pwc->decompress_data; - - return 0; + pdec->version = pdev->release; } |
