Add patches accepted for 2.6.22-rc4
[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / releases / upstream / 2.6.20-rc2 / 0025-ACPI-ibm_acpi-allow-clean-removal.txt
blob553539430fba905ae49c6cacdfbd992051198567
1 From 4afaf54b3b97fa8cf2d1d9bcd7612b195acb53ae Mon Sep 17 00:00:00 2001
2 From: Alexey Starikovskiy <alexey_y_starikovskiy@linux.intel.com>
3 Date: Mon, 18 Dec 2006 14:53:33 -0300
4 Subject: [PATCH 25/28] ACPI: ibm_acpi: allow clean removal
6 Allow clean removal by setting notify_installed in the right place.
8 Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@intel.com>
9 Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
10 Signed-off-by: Len Brown <len.brown@intel.com>
11 ---
12  drivers/acpi/ibm_acpi.c |    3 +--
13  1 files changed, 1 insertions(+), 2 deletions(-)
15 diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
16 index 92e7b6e..1397efb 100644
17 --- a/drivers/acpi/ibm_acpi.c
18 +++ b/drivers/acpi/ibm_acpi.c
19 @@ -2503,7 +2503,7 @@ static int __init setup_notify(struct ibm_struct *ibm)
20                        ibm->name, status);
21                 return -ENODEV;
22         }
24 +       ibm->notify_installed = 1;
25         return 0;
26  }
28 @@ -2580,7 +2580,6 @@ static int __init ibm_init(struct ibm_struct *ibm)
29                 ret = setup_notify(ibm);
30                 if (ret < 0)
31                         return ret;
32 -               ibm->notify_installed = 1;
33         }
35         return 0;
36 -- 
37 1.4.4.2