← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/xserver-xorg-video-ati/oneiric

« back to all changes in this revision

Viewing changes to src/theatre200.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Hooker
  • Date: 2010-07-08 16:45:59 UTC
  • mfrom: (1.1.34 upstream) (0.2.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100708164559-t1gwcpobj4n39lhf
Tags: 1:6.13.1-1ubuntu1
* Merge from Debian Unstable. Remainning Ubuntu changes:
  + debian/control:
    - Add quilt to build-depends for Ubuntu patches
  + debian/patches/100_radeon-6.9.0-bgnr-enable.patch:
    - Smooth plymouth transition enablement patch
  + debian/rules:
    - Add xsfbs patchsys
    - Drop /etc/modprobe.d/radeon-kms.conf install.
  + debian/xserver-xorg-video-ati.{pre,post}inst.in:
    - Clean existing /etc/modprobe.d/radeon-kms.conf on install.
      At best this does nothing (KMS is the default for our kernel)
      and at worst it makes it harder to disable KMS.
* Add debian/gbp.conf pointing to Ubuntu branch to make git-buildpackage
  less narky.
* Drop 102-no-xv-rn50.patch and 103_new_pci_ids.patch from previous
  Ubuntu releases, they are upstream now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/theatre200.c
318
318
        curr_seg = seg_list;
319
319
        while(curr_seg)
320
320
        {
321
 
                Xfree(curr_seg->data);
 
321
                free(curr_seg->data);
322
322
                prev_seg = curr_seg;
323
323
                curr_seg = curr_seg->next;
324
 
                Xfree(prev_seg);
 
324
                free(prev_seg);
325
325
        }
326
326
        fclose(file);
327
327
 
335
335
 
336
336
        while(seg_list)
337
337
        {
338
 
                Xfree(seg_list->data);
 
338
                free(seg_list->data);
339
339
                prev_seg = seg_list;
340
340
                seg_list = seg_list->next;
341
 
                Xfree(prev_seg);
 
341
                free(prev_seg);
342
342
        }
343
343
}
344
344