[patch 6/6] acpi dock: terminate eject request is the dock is not present

[patch 6/6] acpi dock: terminate eject request is the dock is not present

[akpm]

From: Daniel Smolik <marvin@mydatex.cz>

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 <rui.zhang@intel.com>
Cc: Len Brown <lenb@kernel.org>
Cc: "Li, Shaohua" <shaohua.li@intel.com>
Cc: <hmacht@suse.de>
Cc: <stable@kernel.org>		[2.6.26.x, 2.6.27.x, 2.6.28.x]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 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
--- a/drivers/acpi/dock.c~acpi-dock-terminate-eject-request-is-the-dock-is-not-present
+++ a/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;
 
_

Re: [patch 6/6] acpi dock: terminate eject request is the dock is not present

[Len Brown]

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

On Fri, 9 Jan 2009, akpm@linux-foundation.org wrote:

> From: Daniel Smolik <marvin@mydatex.cz>
> 
> 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 <rui.zhang@intel.com>
> Cc: Len Brown <lenb@kernel.org>
> Cc: "Li, Shaohua" <shaohua.li@intel.com>
> Cc: <hmacht@suse.de>
> Cc: <stable@kernel.org>		[2.6.26.x, 2.6.27.x, 2.6.28.x]
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
> 
>  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
> --- a/drivers/acpi/dock.c~acpi-dock-terminate-eject-request-is-the-dock-is-not-present
> +++ a/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;
>  
> _
> 

Re: [patch 6/6] acpi dock: terminate eject request is the dock is not present

[Daniel Smolik]

Len Brown napsal(a):
> 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


> thanks
> Len Brown, Intel Open Source Technology Center
>
> On Fri, 9 Jan 2009, akpm@linux-foundation.org wrote:
>
>   
>> From: Daniel Smolik <marvin@mydatex.cz>
>>
>> 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 <rui.zhang@intel.com>
>> Cc: Len Brown <lenb@kernel.org>
>> Cc: "Li, Shaohua" <shaohua.li@intel.com>
>> Cc: <hmacht@suse.de>
>> Cc: <stable@kernel.org>		[2.6.26.x, 2.6.27.x, 2.6.28.x]
>> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
>> ---
>>
>>  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
>> --- a/drivers/acpi/dock.c~acpi-dock-terminate-eject-request-is-the-dock-is-not-present
>> +++ a/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;
>>  
>> _
>>
>>     

Re: [patch 6/6] acpi dock: terminate eject request is the dock is not present

[Holger Macht]

Am Samstag, den 10.01.2009, 08:42 +0100 schrieb Daniel Smolik:
> Len Brown napsal(a):
> > 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

> 
> Regards
>                       Dan Smolik
> 
> 
> > thanks
> > Len Brown, Intel Open Source Technology Center
> >
> > On Fri, 9 Jan 2009, akpm@linux-foundation.org wrote:
> >
> >   
> >> From: Daniel Smolik <marvin@mydatex.cz>
> >>
> >> 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 <rui.zhang@intel.com>
> >> Cc: Len Brown <lenb@kernel.org>
> >> Cc: "Li, Shaohua" <shaohua.li@intel.com>
> >> Cc: <hmacht@suse.de>
> >> Cc: <stable@kernel.org>		[2.6.26.x, 2.6.27.x, 2.6.28.x]
> >> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> >> ---
> >>
> >>  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
> >> --- a/drivers/acpi/dock.c~acpi-dock-terminate-eject-request-is-the-dock-is-not-present
> >> +++ a/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;
> >>  
> >> _
> >>
> >>     
>