Commit d8a33496 authored Jan 08, 2006 by Marko Kohtala Committed by Linus Torvalds Jan 08, 2006

[PATCH] parport: bring back an unused phase for ppdev ioctl



Earlier fix removed unused phase, but that changed the values for other
phases.  Since these are exposed to userspace through ppdev, it is safer
not to change them.  Restore the unused phase value.

Signed-off-by: Marko Kohtala <marko.kohtala@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent d1c4ac40

include/linux/parport.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -236,12 +236,14 @@ struct pardevice {

		/* IEEE1284 information */

		/* IEEE1284 phases */
		/* IEEE1284 phases. These are exposed to userland through ppdev IOCTL
		* PP[GS]ETPHASE, so do not change existing values. */
		enum ieee1284_phase {
		IEEE1284_PH_FWD_DATA,
		IEEE1284_PH_FWD_IDLE,
		IEEE1284_PH_TERMINATE,
		IEEE1284_PH_NEGOTIATION,
		IEEE1284_PH_HBUSY_DNA,
		IEEE1284_PH_REV_IDLE,
		IEEE1284_PH_HBUSY_DAVAIL,
		IEEE1284_PH_REV_DATA,