← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to sound/soc/atmel/atmel_ssc_dai.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
sound/soc/atmel/atmel_ssc_dai.c
672
672
        /* re-enable interrupts */
673
673
        ssc_writel(ssc_p->ssc->regs, IER, ssc_p->ssc_state.ssc_imr);
674
674
 
675
 
        /* Re-enable recieve and transmit as appropriate */
 
675
        /* Re-enable receive and transmit as appropriate */
676
676
        cr = 0;
677
677
        cr |=
678
678
            (ssc_p->ssc_state.ssc_sr & SSC_BIT(SR_RXEN)) ? SSC_BIT(CR_RXEN) : 0;
848
848
        if (IS_ERR(ssc))
849
849
                pr_warn("Unable to parent ASoC SSC DAI on SSC: %ld\n",
850
850
                        PTR_ERR(ssc));
851
 
        else
 
851
        else {
852
852
                ssc_pdev->dev.parent = &(ssc->pdev->dev);
853
 
        ssc_free(ssc);
 
853
                ssc_free(ssc);
 
854
        }
854
855
 
855
856
        ret = platform_device_add(ssc_pdev);
856
857
        if (ret < 0)