On Tuesday 19 December 2006 8:56 pm, Matthew Garrett wrote:

> --- a/drivers/base/power/sysfs.c
> +++ b/drivers/base/power/sysfs.c
> @@ -46,7 +46,8 @@ static ssize_t state_store(struct device * dev, struct 
> device_attribute *attr, c
>       int error = -EINVAL;
>  
>       /* disallow incomplete suspend sequences */
> -     if (dev->bus && (dev->bus->suspend_late || dev->bus->resume_early))
> +     if (dev->bus && dev->bus->pm_has_noirq_stage 
> +         && dev->bus->pm_has_noirq_stage(dev))
>               return error;
>  

I'm suspecting these two patches won't be merged, but this fragment has
two bugs.  One is the whitespace bug already mentioned.  The other is that
the original test must still be used if that bus primitve doesn't exist.

And in a different vein, I'm a bit surprised that the update to the
feature-removal-schedule.txt file is a separate patch, but:

> +       bus->pm_has_noirq_stage()
> -When:  July 2007
> +When:  Once alternative functionality has been implemented

The "When" shouldn't change.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to