← Back to branch summary

~ubuntu-branches/ubuntu/lucid/hal/lucid-proposed

« back to all changes in this revision

Viewing changes to hald/linux/probing/probe-storage.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2009-12-03 01:21:24 UTC
  • mto: (1.1.18 squeeze)
  • mto: This revision was merged to the branch mainline in revision 165.
  • Revision ID: james.westby@ubuntu.com-20091203012124-3573qknop973uvc2
Tags: upstream-0.5.14
Import upstream version 0.5.14

Show diffs side-by-side

added added

removed removed

Lines of Context:
hald/linux/probing/probe-storage.c
526
526
 
527
527
        
528
528
out:
 
529
        LIBHAL_FREE_DBUS_ERROR (&error);
 
530
 
529
531
        if (cs != NULL) {
530
532
                libhal_device_commit_changeset (ctx, cs, &error);
531
533
                libhal_device_free_changeset (cs);
532
534
        }
533
535
 
 
536
        LIBHAL_FREE_DBUS_ERROR (&error);
 
537
                
534
538
        if (ctx != NULL) {
535
 
                dbus_error_init (&error);
536
539
                libhal_ctx_shutdown (ctx, &error);
 
540
                LIBHAL_FREE_DBUS_ERROR (&error);
537
541
                libhal_ctx_free (ctx);
538
542
        }
539
543