Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 277598 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-1 / +15 lines)
Line  Link Here
0
-- a/acerhk.c
0
++ b/acerhk.c
Lines 2702-2708 static int acerhk_proc_init(void) Link Here
2702
    printk(KERN_INFO"acerhk: could not create /proc/driver/acerhk\n");
2702
    printk(KERN_INFO"acerhk: could not create /proc/driver/acerhk\n");
2703
  }
2703
  }
2704
  else {
2704
  else {
2705
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
2705
    proc_acer_dir->owner = THIS_MODULE;
2706
    proc_acer_dir->owner = THIS_MODULE;
2707
#endif
2706
    /* now create several files, first general info ... */
2708
    /* now create several files, first general info ... */
2707
    entry = create_proc_read_entry("info",
2709
    entry = create_proc_read_entry("info",
2708
                                   0444, proc_acer_dir, acerhk_proc_info, NULL);
2710
                                   0444, proc_acer_dir, acerhk_proc_info, NULL);
Lines 2711-2717 static int acerhk_proc_init(void) Link Here
2711
      remove_proc_entry("driver/acerhk", NULL);
2713
      remove_proc_entry("driver/acerhk", NULL);
2712
      retval = 0;
2714
      retval = 0;
2713
    } else {
2715
    } else {
2716
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
2714
      entry->owner = THIS_MODULE;
2717
      entry->owner = THIS_MODULE;
2718
#endif
2715
      /* ... last pressed key ... */
2719
      /* ... last pressed key ... */
2716
      entry = create_proc_read_entry("key",
2720
      entry = create_proc_read_entry("key",
2717
                                     0444, proc_acer_dir, acerhk_proc_key, NULL);
2721
                                     0444, proc_acer_dir, acerhk_proc_key, NULL);
Lines 2721-2727 static int acerhk_proc_init(void) Link Here
2721
        remove_proc_entry("driver/acerhk", NULL);
2725
        remove_proc_entry("driver/acerhk", NULL);
2722
        retval = 0;
2726
        retval = 0;
2723
      } else {
2727
      } else {
2728
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
2724
        entry->owner = THIS_MODULE;
2729
        entry->owner = THIS_MODULE;
2730
#endif
2725
        /* ... and led control file */
2731
        /* ... and led control file */
2726
        entry = create_proc_entry("led", 0222, proc_acer_dir);
2732
        entry = create_proc_entry("led", 0222, proc_acer_dir);
2727
        if (entry == NULL) {
2733
        if (entry == NULL) {
Lines 2733-2739 static int acerhk_proc_init(void) Link Here
2733
        }
2739
        }
2734
        else {
2740
        else {
2735
          entry->write_proc = acerhk_proc_led;
2741
          entry->write_proc = acerhk_proc_led;
2742
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
2736
          entry->owner = THIS_MODULE;
2743
          entry->owner = THIS_MODULE;
2744
#endif
2737
          /* ... and wireless led controll file */
2745
          /* ... and wireless led controll file */
2738
          entry = create_proc_entry("wirelessled", 0222, proc_acer_dir);
2746
          entry = create_proc_entry("wirelessled", 0222, proc_acer_dir);
2739
          if (entry == NULL) {
2747
          if (entry == NULL) {
Lines 2746-2752 static int acerhk_proc_init(void) Link Here
2746
          }
2754
          }
2747
          else {
2755
          else {
2748
            entry->write_proc = acerhk_proc_wirelessled;
2756
            entry->write_proc = acerhk_proc_wirelessled;
2757
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
2749
            entry->owner = THIS_MODULE;
2758
            entry->owner = THIS_MODULE;
2759
#endif
2750
            /* ... and bluetooth led controll file */
2760
            /* ... and bluetooth led controll file */
2751
            entry = create_proc_entry("blueled", 0222, proc_acer_dir);
2761
            entry = create_proc_entry("blueled", 0222, proc_acer_dir);
2752
            if (entry == NULL) {
2762
            if (entry == NULL) {
Lines 2759-2765 static int acerhk_proc_init(void) Link Here
2759
              retval = 0;
2769
              retval = 0;
2760
            } else {
2770
            } else {
2761
              entry->write_proc = acerhk_proc_blueled;
2771
              entry->write_proc = acerhk_proc_blueled;
2772
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
2762
              entry->owner = THIS_MODULE;
2773
              entry->owner = THIS_MODULE;
2774
#endif
2763
              retval = 1;
2775
              retval = 1;
2764
#ifdef ACERDEBUG
2776
#ifdef ACERDEBUG
2765
              /* add extra file for debugging purposes */
2777
              /* add extra file for debugging purposes */
Lines 2776-2782 static int acerhk_proc_init(void) Link Here
2776
              }
2788
              }
2777
              else {
2789
              else {
2778
                entry->write_proc = acerhk_proc_debug;
2790
                entry->write_proc = acerhk_proc_debug;
2791
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
2779
                entry->owner = THIS_MODULE;
2792
                entry->owner = THIS_MODULE;
2793
#endif
2780
                retval = 1;
2794
                retval = 1;
2781
              }
2795
              }
2782
#endif
2796
#endif

Return to bug 277598