← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/net/ariadne.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:
drivers/net/ariadne.c
182
182
        return -EBUSY;
183
183
    r2 = request_mem_region(mem_start, ARIADNE_RAM_SIZE, "RAM");
184
184
    if (!r2) {
185
 
        release_resource(r1);
 
185
        release_mem_region(base_addr, sizeof(struct Am79C960));
186
186
        return -EBUSY;
187
187
    }
188
188
 
189
189
    dev = alloc_etherdev(sizeof(struct ariadne_private));
190
190
    if (dev == NULL) {
191
 
        release_resource(r1);
192
 
        release_resource(r2);
 
191
        release_mem_region(base_addr, sizeof(struct Am79C960));
 
192
        release_mem_region(mem_start, ARIADNE_RAM_SIZE);
193
193
        return -ENOMEM;
194
194
    }
195
195
 
213
213
 
214
214
    err = register_netdev(dev);
215
215
    if (err) {
216
 
        release_resource(r1);
217
 
        release_resource(r2);
 
216
        release_mem_region(base_addr, sizeof(struct Am79C960));
 
217
        release_mem_region(mem_start, ARIADNE_RAM_SIZE);
218
218
        free_netdev(dev);
219
219
        return err;
220
220
    }