diff options
Diffstat (limited to 'arch')
| -rwxr-xr-x | arch/arm/mach-ux500/dma_40.c | 3 | ||||
| -rwxr-xr-x | arch/arm/mach-ux500/prcmu-fw.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/dma_40.c b/arch/arm/mach-ux500/dma_40.c index a616f592807..37de49281ff 100755 --- a/arch/arm/mach-ux500/dma_40.c +++ b/arch/arm/mach-ux500/dma_40.c @@ -3219,6 +3219,9 @@ int stm_dma_residue(int pipe_id) params = ((void *) (dma_drv_data->lchan_params_base.log_addr) + (info->src_dev_type * 32)); + else + return remaining; + remaining = MEM_READ_BITS(params->dmac_lcsp2, MEM_LCSP2_ECNT_MASK, MEM_LCSP2_ECNT_POS); diff --git a/arch/arm/mach-ux500/prcmu-fw.c b/arch/arm/mach-ux500/prcmu-fw.c index 44208066790..f6a6cdcf3c3 100755 --- a/arch/arm/mach-ux500/prcmu-fw.c +++ b/arch/arm/mach-ux500/prcmu-fw.c @@ -1394,9 +1394,6 @@ int prcmu_apply_ap_state_transition(enum ap_pwrst_trans_t transition, printk(KERN_INFO "u8500-prcm : Woken from Sleep OK\n"); break; - - printk(KERN_INFO "TODO: deep sleep \n"); - break; case APBOOT_TO_APEXECUTE: break; default: |