diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-12-20 07:45:20 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-12-23 11:46:03 -0500 |
commit | 0418ca6073478f54f1da2e4013fa50d36838de75 (patch) | |
tree | 022e22c984e1cfc2c5cf7c6fbc36c050ec614cc1 | |
parent | bbfebeea7640973613c484f0281bdd15d68fd873 (diff) |
[media] em28xx: ensure "closing" messages terminate with a newline
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")
Cc: <stable@vger.kernel.org>
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>
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-audio.c | 2 | ||||
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-dvb.c | 2 | ||||
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-input.c | 2 | ||||
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-video.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-audio.c b/drivers/media/usb/em28xx/em28xx-audio.c index 44ae1e0661e6..52dc9d70da72 100644 --- 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 em28xx *dev) | |||
981 | return 0; | 981 | return 0; |
982 | } | 982 | } |
983 | 983 | ||
984 | em28xx_info("Closing audio extension"); | 984 | em28xx_info("Closing audio extension\n"); |
985 | 985 | ||
986 | if (dev->adev.sndcard) { | 986 | if (dev->adev.sndcard) { |
987 | snd_card_disconnect(dev->adev.sndcard); | 987 | snd_card_disconnect(dev->adev.sndcard); |
diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c index 9877b699c6bc..80c384c390e2 100644 --- 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 *dev) | |||
1724 | if (!dev->dvb) | 1724 | if (!dev->dvb) |
1725 | return 0; | 1725 | return 0; |
1726 | 1726 | ||
1727 | em28xx_info("Closing DVB extension"); | 1727 | em28xx_info("Closing DVB extension\n"); |
1728 | 1728 | ||
1729 | dvb = dev->dvb; | 1729 | dvb = dev->dvb; |
1730 | client = dvb->i2c_client_tuner; | 1730 | client = dvb->i2c_client_tuner; |
diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c index ef36c49ef166..aea22deadc0a 100644 --- 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 *dev) | |||
832 | return 0; | 832 | return 0; |
833 | } | 833 | } |
834 | 834 | ||
835 | em28xx_info("Closing input extension"); | 835 | em28xx_info("Closing input extension\n"); |
836 | 836 | ||
837 | em28xx_shutdown_buttons(dev); | 837 | em28xx_shutdown_buttons(dev); |
838 | 838 | ||
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index 3691b39424be..eeb4ad5a3a76 100644 --- 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 em28xx *dev) | |||
1958 | if (v4l2 == NULL) | 1958 | if (v4l2 == NULL) |
1959 | return 0; | 1959 | return 0; |
1960 | 1960 | ||
1961 | em28xx_info("Closing video extension"); | 1961 | em28xx_info("Closing video extension\n"); |
1962 | 1962 | ||
1963 | mutex_lock(&dev->lock); | 1963 | mutex_lock(&dev->lock); |
1964 | 1964 | ||