| From 0418ca6073478f54f1da2e4013fa50d36838de75 Mon Sep 17 00:00:00 2001 |
| From: Russell King <rmk+kernel@arm.linux.org.uk> |
| Date: Sat, 20 Dec 2014 09:45:20 -0300 |
| Subject: [media] em28xx: ensure "closing" messages terminate with a newline |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Russell King <rmk+kernel@arm.linux.org.uk> |
| |
| commit 0418ca6073478f54f1da2e4013fa50d36838de75 upstream. |
| |
| The lockdep splat addressed in a previous commit revealed that at |
| least one message in em28xx-input.c was missing a new line: |
| |
| em28178 #0: Closing input extensionINFO: trying to register non-static key. |
| |
| Further inspection shows several other messages also miss a new line. |
| These will be fixed in a subsequent patch. |
| |
| Fixes: aa929ad783c0 ("[media] em28xx: print a message at disconnect") |
| |
| Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> |
| Reviewed-by: Frank Schรคfer <fschaefer.oss@googlemail.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/media/usb/em28xx/em28xx-audio.c | 2 +- |
| drivers/media/usb/em28xx/em28xx-dvb.c | 2 +- |
| drivers/media/usb/em28xx/em28xx-input.c | 2 +- |
| drivers/media/usb/em28xx/em28xx-video.c | 2 +- |
| 4 files changed, 4 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/media/usb/em28xx/em28xx-audio.c |
| +++ b/drivers/media/usb/em28xx/em28xx-audio.c |
| @@ -981,7 +981,7 @@ static int em28xx_audio_fini(struct em28 |
| return 0; |
| } |
| |
| - em28xx_info("Closing audio extension"); |
| + em28xx_info("Closing audio extension\n"); |
| |
| if (dev->adev.sndcard) { |
| snd_card_disconnect(dev->adev.sndcard); |
| --- a/drivers/media/usb/em28xx/em28xx-dvb.c |
| +++ b/drivers/media/usb/em28xx/em28xx-dvb.c |
| @@ -1724,7 +1724,7 @@ static int em28xx_dvb_fini(struct em28xx |
| if (!dev->dvb) |
| return 0; |
| |
| - em28xx_info("Closing DVB extension"); |
| + em28xx_info("Closing DVB extension\n"); |
| |
| dvb = dev->dvb; |
| client = dvb->i2c_client_tuner; |
| --- a/drivers/media/usb/em28xx/em28xx-input.c |
| +++ b/drivers/media/usb/em28xx/em28xx-input.c |
| @@ -832,7 +832,7 @@ static int em28xx_ir_fini(struct em28xx |
| return 0; |
| } |
| |
| - em28xx_info("Closing input extension"); |
| + em28xx_info("Closing input extension\n"); |
| |
| em28xx_shutdown_buttons(dev); |
| |
| --- a/drivers/media/usb/em28xx/em28xx-video.c |
| +++ b/drivers/media/usb/em28xx/em28xx-video.c |
| @@ -1958,7 +1958,7 @@ static int em28xx_v4l2_fini(struct em28x |
| if (v4l2 == NULL) |
| return 0; |
| |
| - em28xx_info("Closing video extension"); |
| + em28xx_info("Closing video extension\n"); |
| |
| mutex_lock(&dev->lock); |
| |
