aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2014-01-12 17:22:07 -0500
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-01-14 11:38:11 -0500
commitaa929ad783c0762f276c8c810f1c7f00b12dca4a (patch)
treeb8bad4c0868442169e4a1090ba2d3013071e04b3
parent1fe2e3bff4f862d971207c846e4df61160c0e858 (diff)
[media] em28xx: print a message at disconnect
That helps to identify if something fails and explain why em28xx struct is not freed (if it ever happens). Reviewed-by: Frank Schäfer <fschaefer.oss@googlemail.com> Tested-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/media/usb/em28xx/em28xx-audio.c2
-rw-r--r--drivers/media/usb/em28xx/em28xx-dvb.c2
-rw-r--r--drivers/media/usb/em28xx/em28xx-input.c2
-rw-r--r--drivers/media/usb/em28xx/em28xx-video.c2
4 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-audio.c b/drivers/media/usb/em28xx/em28xx-audio.c
index 7f762db94b5f..26cf431b1a46 100644
--- a/drivers/media/usb/em28xx/em28xx-audio.c
+++ b/drivers/media/usb/em28xx/em28xx-audio.c
@@ -956,6 +956,8 @@ static int em28xx_audio_fini(struct em28xx *dev)
956 return 0; 956 return 0;
957 } 957 }
958 958
959 em28xx_info("Closing audio extension");
960
959 snd_card_disconnect(dev->adev.sndcard); 961 snd_card_disconnect(dev->adev.sndcard);
960 em28xx_audio_free_urb(dev); 962 em28xx_audio_free_urb(dev);
961 963
diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
index 5ea563e3f0e4..f4cdf9e8dc18 100644
--- a/drivers/media/usb/em28xx/em28xx-dvb.c
+++ b/drivers/media/usb/em28xx/em28xx-dvb.c
@@ -1472,6 +1472,8 @@ static int em28xx_dvb_fini(struct em28xx *dev)
1472 return 0; 1472 return 0;
1473 } 1473 }
1474 1474
1475 em28xx_info("Closing DVB extension");
1476
1475 if (dev->dvb) { 1477 if (dev->dvb) {
1476 struct em28xx_dvb *dvb = dev->dvb; 1478 struct em28xx_dvb *dvb = dev->dvb;
1477 1479
diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c
index 61c061f3a476..18f65d89d4bc 100644
--- a/drivers/media/usb/em28xx/em28xx-input.c
+++ b/drivers/media/usb/em28xx/em28xx-input.c
@@ -810,6 +810,8 @@ static int em28xx_ir_fini(struct em28xx *dev)
810 return 0; 810 return 0;
811 } 811 }
812 812
813 em28xx_info("Closing input extension");
814
813 em28xx_shutdown_buttons(dev); 815 em28xx_shutdown_buttons(dev);
814 816
815 /* skip detach on non attached boards */ 817 /* skip detach on non attached boards */
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index 587ff3fe9402..1486d4740973 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -1894,6 +1894,8 @@ static int em28xx_v4l2_fini(struct em28xx *dev)
1894 return 0; 1894 return 0;
1895 } 1895 }
1896 1896
1897 em28xx_info("Closing video extension");
1898
1897 v4l2_device_disconnect(&dev->v4l2_dev); 1899 v4l2_device_disconnect(&dev->v4l2_dev);
1898 1900
1899 em28xx_uninit_usb_xfer(dev, EM28XX_ANALOG_MODE); 1901 em28xx_uninit_usb_xfer(dev, EM28XX_ANALOG_MODE);