diff options
author | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-08-09 20:47:18 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-08-21 16:25:08 -0400 |
commit | 811872404bb021b73ecb4b78de88bd2d7f26548e (patch) | |
tree | 04676214728630b7c4fb0ff374dada6f9686d48a | |
parent | 83afb32aa9d8cc77049c0e4e124e3bed8b88428f (diff) |
[media] au0828: add pr_info to track au0828 suspend/resume code
Suspend/resume conditions can be very tricky. Add some info
printk's to help tracking what's happening there.
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r-- | drivers/media/usb/au0828/au0828-core.c | 4 | ||||
-rw-r--r-- | drivers/media/usb/au0828/au0828-dvb.c | 4 | ||||
-rw-r--r-- | drivers/media/usb/au0828/au0828-input.c | 4 | ||||
-rw-r--r-- | drivers/media/usb/au0828/au0828-video.c | 5 |
4 files changed, 17 insertions, 0 deletions
diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c index 452d14249348..bc064803b6c7 100644 --- a/drivers/media/usb/au0828/au0828-core.c +++ b/drivers/media/usb/au0828/au0828-core.c | |||
@@ -288,6 +288,8 @@ static int au0828_suspend(struct usb_interface *interface, | |||
288 | if (!dev) | 288 | if (!dev) |
289 | return 0; | 289 | return 0; |
290 | 290 | ||
291 | pr_info("Suspend\n"); | ||
292 | |||
291 | au0828_rc_suspend(dev); | 293 | au0828_rc_suspend(dev); |
292 | au0828_v4l2_suspend(dev); | 294 | au0828_v4l2_suspend(dev); |
293 | au0828_dvb_suspend(dev); | 295 | au0828_dvb_suspend(dev); |
@@ -303,6 +305,8 @@ static int au0828_resume(struct usb_interface *interface) | |||
303 | if (!dev) | 305 | if (!dev) |
304 | return 0; | 306 | return 0; |
305 | 307 | ||
308 | pr_info("Resume\n"); | ||
309 | |||
306 | /* Power Up the bridge */ | 310 | /* Power Up the bridge */ |
307 | au0828_write(dev, REG_600, 1 << 4); | 311 | au0828_write(dev, REG_600, 1 << 4); |
308 | 312 | ||
diff --git a/drivers/media/usb/au0828/au0828-dvb.c b/drivers/media/usb/au0828/au0828-dvb.c index 99cf83bca033..ee45990c0be1 100644 --- a/drivers/media/usb/au0828/au0828-dvb.c +++ b/drivers/media/usb/au0828/au0828-dvb.c | |||
@@ -619,6 +619,8 @@ void au0828_dvb_suspend(struct au0828_dev *dev) | |||
619 | struct au0828_dvb *dvb = &dev->dvb; | 619 | struct au0828_dvb *dvb = &dev->dvb; |
620 | 620 | ||
621 | if (dvb && dev->urb_streaming) { | 621 | if (dvb && dev->urb_streaming) { |
622 | pr_info("stopping DVB\n"); | ||
623 | |||
622 | cancel_work_sync(&dev->restart_streaming); | 624 | cancel_work_sync(&dev->restart_streaming); |
623 | 625 | ||
624 | /* Stop transport */ | 626 | /* Stop transport */ |
@@ -634,6 +636,8 @@ void au0828_dvb_resume(struct au0828_dev *dev) | |||
634 | struct au0828_dvb *dvb = &dev->dvb; | 636 | struct au0828_dvb *dvb = &dev->dvb; |
635 | 637 | ||
636 | if (dvb && dev->urb_streaming) { | 638 | if (dvb && dev->urb_streaming) { |
639 | pr_info("resuming DVB\n"); | ||
640 | |||
637 | au0828_set_frontend(dvb->frontend); | 641 | au0828_set_frontend(dvb->frontend); |
638 | 642 | ||
639 | /* Start transport */ | 643 | /* Start transport */ |
diff --git a/drivers/media/usb/au0828/au0828-input.c b/drivers/media/usb/au0828/au0828-input.c index 6db1ce8e09e1..63995f97dc65 100644 --- a/drivers/media/usb/au0828/au0828-input.c +++ b/drivers/media/usb/au0828/au0828-input.c | |||
@@ -378,6 +378,8 @@ int au0828_rc_suspend(struct au0828_dev *dev) | |||
378 | if (!ir) | 378 | if (!ir) |
379 | return 0; | 379 | return 0; |
380 | 380 | ||
381 | pr_info("Stopping RC\n"); | ||
382 | |||
381 | cancel_delayed_work_sync(&ir->work); | 383 | cancel_delayed_work_sync(&ir->work); |
382 | 384 | ||
383 | /* Disable IR */ | 385 | /* Disable IR */ |
@@ -393,6 +395,8 @@ int au0828_rc_resume(struct au0828_dev *dev) | |||
393 | if (!ir) | 395 | if (!ir) |
394 | return 0; | 396 | return 0; |
395 | 397 | ||
398 | pr_info("Restarting RC\n"); | ||
399 | |||
396 | /* Enable IR */ | 400 | /* Enable IR */ |
397 | au8522_rc_set(ir, 0xe0, 1 << 4); | 401 | au8522_rc_set(ir, 0xe0, 1 << 4); |
398 | 402 | ||
diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c index 193b2e364266..5f337b118bff 100644 --- a/drivers/media/usb/au0828/au0828-video.c +++ b/drivers/media/usb/au0828/au0828-video.c | |||
@@ -1876,7 +1876,10 @@ void au0828_v4l2_suspend(struct au0828_dev *dev) | |||
1876 | struct urb *urb; | 1876 | struct urb *urb; |
1877 | int i; | 1877 | int i; |
1878 | 1878 | ||
1879 | pr_info("stopping V4L2\n"); | ||
1880 | |||
1879 | if (dev->stream_state == STREAM_ON) { | 1881 | if (dev->stream_state == STREAM_ON) { |
1882 | pr_info("stopping V4L2 active URBs\n"); | ||
1880 | au0828_analog_stream_disable(dev); | 1883 | au0828_analog_stream_disable(dev); |
1881 | /* stop urbs */ | 1884 | /* stop urbs */ |
1882 | for (i = 0; i < dev->isoc_ctl.num_bufs; i++) { | 1885 | for (i = 0; i < dev->isoc_ctl.num_bufs; i++) { |
@@ -1900,6 +1903,8 @@ void au0828_v4l2_resume(struct au0828_dev *dev) | |||
1900 | { | 1903 | { |
1901 | int i, rc; | 1904 | int i, rc; |
1902 | 1905 | ||
1906 | pr_info("restarting V4L2\n"); | ||
1907 | |||
1903 | if (dev->stream_state == STREAM_ON) { | 1908 | if (dev->stream_state == STREAM_ON) { |
1904 | au0828_stream_interrupt(dev); | 1909 | au0828_stream_interrupt(dev); |
1905 | au0828_init_tuner(dev); | 1910 | au0828_init_tuner(dev); |