← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to drivers/net/ethernet/tehuti/tehuti.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/ethernet/tehuti/tehuti.c
341
341
out:
342
342
        if (master)
343
343
                WRITE_REG(priv, regINIT_SEMAPHORE, 1);
344
 
        if (fw)
345
 
                release_firmware(fw);
 
344
 
 
345
        release_firmware(fw);
346
346
 
347
347
        if (rc) {
348
348
                netdev_err(priv->ndev, "firmware loading failed\n");
1317
1317
 
1318
1318
static void print_rxfd(struct rxf_desc *rxfd)
1319
1319
{
1320
 
        DBG("=== RxF desc CHIP ORDER/ENDIANESS =============\n"
 
1320
        DBG("=== RxF desc CHIP ORDER/ENDIANNESS =============\n"
1321
1321
            "info 0x%x va_lo %u pa_lo 0x%x pa_hi 0x%x len 0x%x\n",
1322
1322
            rxfd->info, rxfd->va_lo, rxfd->pa_lo, rxfd->pa_hi, rxfd->len);
1323
1323
}
1988
1988
                /* these fields are used for info purposes only
1989
1989
                 * so we can have them same for all ports of the board */
1990
1990
                ndev->if_port = port;
1991
 
                ndev->base_addr = pciaddr;
1992
 
                ndev->mem_start = pciaddr;
1993
 
                ndev->mem_end = pciaddr + regionSize;
1994
 
                ndev->irq = pdev->irq;
1995
1991
                ndev->features = NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_TSO
1996
1992
                    | NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX |
1997
1993
                    NETIF_F_HW_VLAN_FILTER | NETIF_F_RXCSUM