Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25dd1652 authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab
Browse files

[media] em28xx: move v4l2 dummy clock deregistration from the core to the v4l extension 



Signed-off-by: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 5ad10de6

drivers/media/usb/em28xx/em28xx-cards.c

+0 −3
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <media/tvaudio.h>

#include <media/i2c-addr.h>

#include <media/tveeprom.h>

#include <media/v4l2-clk.h>

#include <media/v4l2-common.h>



#include "em28xx.h"
@@ -2880,8 +2879,6 @@ void em28xx_release_resources(struct em28xx *dev) 
	if (dev->def_i2c_bus)

		em28xx_i2c_unregister(dev, 1);

	em28xx_i2c_unregister(dev, 0);

	if (dev->clk)

		v4l2_clk_unregister_fixed(dev->clk);



	usb_put_dev(dev->udev);

drivers/media/usb/em28xx/em28xx-video.c

+6 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <media/v4l2-common.h>

#include <media/v4l2-ioctl.h>

#include <media/v4l2-event.h>

#include <media/v4l2-clk.h>

#include <media/msp3400.h>

#include <media/tuner.h>
@@ -1923,6 +1924,11 @@ static int em28xx_v4l2_fini(struct em28xx *dev) 
		dev->vdev = NULL;

	}



	if (dev->clk) {

		v4l2_clk_unregister_fixed(dev->clk);

		dev->clk = NULL;

	}



	if (dev->users)

		em28xx_warn("Device is open ! Deregistration and memory deallocation are deferred on close.\n");