diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/pci/saa7164/saa7164-core.c | 2 | ||||
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 2 | ||||
-rw-r--r-- | drivers/media/radio/radio-shark.c | 2 | ||||
-rw-r--r-- | drivers/media/radio/radio-shark2.c | 2 | ||||
-rw-r--r-- | drivers/media/usb/dvb-usb/opera1.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/pci/saa7164/saa7164-core.c b/drivers/media/pci/saa7164/saa7164-core.c index 63502e7a2a76..7618fdae811e 100644 --- a/drivers/media/pci/saa7164/saa7164-core.c +++ b/drivers/media/pci/saa7164/saa7164-core.c | |||
@@ -54,7 +54,7 @@ MODULE_PARM_DESC(debug, "enable debug messages"); | |||
54 | 54 | ||
55 | unsigned int fw_debug; | 55 | unsigned int fw_debug; |
56 | module_param(fw_debug, int, 0644); | 56 | module_param(fw_debug, int, 0644); |
57 | MODULE_PARM_DESC(fw_debug, "Firware debug level def:2"); | 57 | MODULE_PARM_DESC(fw_debug, "Firmware debug level def:2"); |
58 | 58 | ||
59 | unsigned int encoder_buffers = SAA7164_MAX_ENCODER_BUFFERS; | 59 | unsigned int encoder_buffers = SAA7164_MAX_ENCODER_BUFFERS; |
60 | module_param(encoder_buffers, int, 0644); | 60 | module_param(encoder_buffers, int, 0644); |
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c index beb6dbacebd9..98a9c093a6b9 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | |||
@@ -1312,7 +1312,7 @@ static inline int s5p_mfc_get_new_ctx(struct s5p_mfc_dev *dev) | |||
1312 | int cnt; | 1312 | int cnt; |
1313 | 1313 | ||
1314 | spin_lock_irqsave(&dev->condlock, flags); | 1314 | spin_lock_irqsave(&dev->condlock, flags); |
1315 | mfc_debug(2, "Previos context: %d (bits %08lx)\n", dev->curr_ctx, | 1315 | mfc_debug(2, "Previous context: %d (bits %08lx)\n", dev->curr_ctx, |
1316 | dev->ctx_work_bits); | 1316 | dev->ctx_work_bits); |
1317 | new_ctx = (dev->curr_ctx + 1) % MFC_NUM_CONTEXTS; | 1317 | new_ctx = (dev->curr_ctx + 1) % MFC_NUM_CONTEXTS; |
1318 | cnt = 0; | 1318 | cnt = 0; |
diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c index 8c309c7134d7..8fa18ab5b725 100644 --- a/drivers/media/radio/radio-shark.c +++ b/drivers/media/radio/radio-shark.c | |||
@@ -284,7 +284,7 @@ static void shark_resume_leds(struct shark_device *shark) | |||
284 | static int shark_register_leds(struct shark_device *shark, struct device *dev) | 284 | static int shark_register_leds(struct shark_device *shark, struct device *dev) |
285 | { | 285 | { |
286 | v4l2_warn(&shark->v4l2_dev, | 286 | v4l2_warn(&shark->v4l2_dev, |
287 | "CONFIG_LED_CLASS not enabled, LED support disabled\n"); | 287 | "CONFIG_LEDS_CLASS not enabled, LED support disabled\n"); |
288 | return 0; | 288 | return 0; |
289 | } | 289 | } |
290 | static inline void shark_unregister_leds(struct shark_device *shark) { } | 290 | static inline void shark_unregister_leds(struct shark_device *shark) { } |
diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c index ef65ebbd5364..9fb669721e66 100644 --- a/drivers/media/radio/radio-shark2.c +++ b/drivers/media/radio/radio-shark2.c | |||
@@ -250,7 +250,7 @@ static void shark_resume_leds(struct shark_device *shark) | |||
250 | static int shark_register_leds(struct shark_device *shark, struct device *dev) | 250 | static int shark_register_leds(struct shark_device *shark, struct device *dev) |
251 | { | 251 | { |
252 | v4l2_warn(&shark->v4l2_dev, | 252 | v4l2_warn(&shark->v4l2_dev, |
253 | "CONFIG_LED_CLASS not enabled, LED support disabled\n"); | 253 | "CONFIG_LEDS_CLASS not enabled, LED support disabled\n"); |
254 | return 0; | 254 | return 0; |
255 | } | 255 | } |
256 | static inline void shark_unregister_leds(struct shark_device *shark) { } | 256 | static inline void shark_unregister_leds(struct shark_device *shark) { } |
diff --git a/drivers/media/usb/dvb-usb/opera1.c b/drivers/media/usb/dvb-usb/opera1.c index c8a95042dfbc..16ba90acf539 100644 --- a/drivers/media/usb/dvb-usb/opera1.c +++ b/drivers/media/usb/dvb-usb/opera1.c | |||
@@ -151,7 +151,7 @@ static int opera1_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], | |||
151 | break; | 151 | break; |
152 | } | 152 | } |
153 | if (dvb_usb_opera1_debug & 0x10) | 153 | if (dvb_usb_opera1_debug & 0x10) |
154 | info("sending i2c mesage %d %d", tmp, msg[i].len); | 154 | info("sending i2c message %d %d", tmp, msg[i].len); |
155 | } | 155 | } |
156 | mutex_unlock(&d->i2c_mutex); | 156 | mutex_unlock(&d->i2c_mutex); |
157 | return num; | 157 | return num; |