Skip to contentSkip to conversation

acpi dock: terminate eject request is the dock is not present

PATCH Applied [email protected] 4 participants 4 messages Jan 9, 2009 – Jan 11, 2009 ACPI

lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 6/6 acpi dock: terminate eject request is the dock is not present

From: Daniel Smolik <[email protected]>

Taken from http://bugzilla.kernel.org/show_bug.cgi?id=12360

nfi if it's right - I merged it so it wouldn't get lost.

Cc Zhang Rui <[email protected]>
Cc Len Brown <[email protected]>
Cc "Li, Shaohua" <[email protected]>
Cc <[email protected]>
Cc <[email protected]> [2.6.26.x, 2.6.27.x, 2.6.28.x]
Signed-off-by Andrew Morton <[email protected]>

---

 drivers/acpi/dock.c |    3 +++
 1 file changed, 3 insertions(+)
drivers/acpi/dock.c renamed from drivers/acpi/dock.c~acpi-dock-terminate-eject-request-is-the-dock-is-not-present +3 -0
diff -puN drivers/acpi/dock.c~acpi-dock-terminate-eject-request-is-the-dock-is-not-present drivers/acpi/dock.c
@@ -668,6 +668,9 @@ EXPORT_SYMBOL_GPL(unregister_hotplug_doc
  */
 static int handle_eject_request(struct dock_station *ds, u32 event)
 {
+	if (!dock_present(ds))
+		return -ENODEV;
+
 	if (dock_in_progress(ds))
 		return -EBUSY;

_

reviewer
#1 lore raw

The bug report suggest that this patch is not a complete fix for the issue, so I'd prefer we get a resolution, or at least a better understanding of the failure, before sending patches upstream for this issue.

thanks
Len Brown, Intel Open Source Technology Center

Quoted 32 lines · On Fri, 9 Jan 2009, [email protected] wrote:

From: Daniel Smolik <[email protected]>

Taken from http://bugzilla.kernel.org/show_bug.cgi?id=12360

nfi if it's right - I merged it so it wouldn't get lost.

Cc Zhang Rui <[email protected]>
Cc Len Brown <[email protected]>
Cc "Li, Shaohua" <[email protected]>
Cc <[email protected]>
Cc <[email protected]> [2.6.26.x, 2.6.27.x, 2.6.28.x]
Signed-off-by Andrew Morton <[email protected]>

---

 drivers/acpi/dock.c |    3 +++
 1 file changed, 3 insertions(+)

diff -puN drivers/acpi/dock.c~acpi-dock-terminate-eject-request-is-the-dock-is-not-present drivers/acpi/dock.c

drivers/acpi/dock.c renamed from drivers/acpi/dock.c~acpi-dock-terminate-eject-request-is-the-dock-is-not-present +3 -0
@@ -668,6 +668,9 @@ EXPORT_SYMBOL_GPL(unregister_hotplug_doc
  */
 static int handle_eject_request(struct dock_station *ds, u32 event)
 {
+	if (!dock_present(ds))
+		return -ENODEV;
+
 	if (dock_in_progress(ds))
 		return -EBUSY;

_

#2 lore raw

Len Brown napsal(a):

Quoted 4 lines

The bug report suggest that this patch is not a complete fix for the issue, so I'd prefer we get a resolution, or at least a better understanding of the failure, before sending patches upstream
for this issue.

Hi,
you are right I don't understand how it works. I only diff dock.c from 2.6.26 to .26.28 and search differences. But I apply this patch 5 days ago and dock and undock witout problems as with 2.6.26.

Regards
Dan Smolik

Quoted 39 lines

thanks
Len Brown, Intel Open Source Technology Center

Quoted 33 lines · On Fri, 9 Jan 2009, [email protected] wrote:

From: Daniel Smolik <[email protected]>

Taken from http://bugzilla.kernel.org/show_bug.cgi?id=12360

nfi if it's right - I merged it so it wouldn't get lost.

Cc Zhang Rui <[email protected]>
Cc Len Brown <[email protected]>
Cc "Li, Shaohua" <[email protected]>
Cc <[email protected]>
Cc <[email protected]> [2.6.26.x, 2.6.27.x, 2.6.28.x]
Signed-off-by Andrew Morton <[email protected]>

---

 drivers/acpi/dock.c |    3 +++
 1 file changed, 3 insertions(+)

diff -puN drivers/acpi/dock.c~acpi-dock-terminate-eject-request-is-the-dock-is-not-present drivers/acpi/dock.c

drivers/acpi/dock.c renamed from drivers/acpi/dock.c~acpi-dock-terminate-eject-request-is-the-dock-is-not-present +3 -0
@@ -668,6 +668,9 @@ EXPORT_SYMBOL_GPL(unregister_hotplug_doc
  */
 static int handle_eject_request(struct dock_station *ds, u32 event)
 {
+	if (!dock_present(ds))
+		return -ENODEV;
+
 	if (dock_in_progress(ds))
 		return -EBUSY;

_

#3 lore raw

Am Samstag, den 10.01.2009, 08:42 +0100 schrieb Daniel Smolik:

Quoted 11 lines

Len Brown napsal(a):

Quoted 5 lines

The bug report suggest that this patch is not a complete fix for the issue, so I'd prefer we get a resolution, or at least a better understanding of the failure, before sending patches upstream for this issue.

Hi,
you are right I don't understand how it works. I only diff dock.c from 2.6.26 to .26.28 and search differences.
But I apply this patch 5 days ago and dock and undock witout problems as with 2.6.26.

You also tried to eject/insert your bay with this patch applied. This cannot work, at least not in a clean way.

I'm currently debugging and seem to get the idea what's going wrong. Stay tuned...

Regards,
Holger

Quoted 45 lines

Regards
Dan Smolik

Quoted 39 lines

thanks
Len Brown, Intel Open Source Technology Center

Quoted 33 lines · On Fri, 9 Jan 2009, [email protected] wrote:

From: Daniel Smolik <[email protected]>

Taken from http://bugzilla.kernel.org/show_bug.cgi?id=12360

nfi if it's right - I merged it so it wouldn't get lost.

Cc Zhang Rui <[email protected]>
Cc Len Brown <[email protected]>
Cc "Li, Shaohua" <[email protected]>
Cc <[email protected]>
Cc <[email protected]> [2.6.26.x, 2.6.27.x, 2.6.28.x]
Signed-off-by Andrew Morton <[email protected]>

---

 drivers/acpi/dock.c |    3 +++
 1 file changed, 3 insertions(+)

diff -puN drivers/acpi/dock.c~acpi-dock-terminate-eject-request-is-the-dock-is-not-present drivers/acpi/dock.c

drivers/acpi/dock.c renamed from drivers/acpi/dock.c~acpi-dock-terminate-eject-request-is-the-dock-is-not-present +3 -0
@@ -668,6 +668,9 @@ EXPORT_SYMBOL_GPL(unregister_hotplug_doc
  */
 static int handle_eject_request(struct dock_station *ds, u32 event)
 {
+	if (!dock_present(ds))
+		return -ENODEV;
+
 	if (dock_in_progress(ds))
 		return -EBUSY;

_