[kernel] r14633 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Sun Nov 15 18:12:26 2009
New Revision: 14633

Log:
Undo PCMCIA ABI change in 2.6.31.6

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/undo-pcmcia-abi-change.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/2

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun Nov 15 17:01:44 2009	(r14632)
+++ dists/sid/linux-2.6/debian/changelog	Sun Nov 15 18:12:26 2009	(r14633)
@@ -22,6 +22,7 @@
     - KEYS: get_instantiation_keyring() should inc the keyring refcount
       in all cases (CVE-2009-3624)
     - netlink: fix typo in initialization (CVE-2009-3612)
+  * Undo PCMCIA ABI change in 2.6.31.6
   * Hide wireless keys and wake-on-LAN password when including network
     configuration in bug reports
   * Add Geode LX/NX to list of 686-class processors

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/undo-pcmcia-abi-change.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/undo-pcmcia-abi-change.patch	Sun Nov 15 18:12:26 2009	(r14633)
@@ -0,0 +1,63 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: [PATCH] Undo PCMCIA ABI change in 2.6.31.6
+
+Use unused bit of pcmcia_socket::state instead of adding a separate
+resume_status member.
+
+diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
+index 698d75c..ccf9968 100644
+--- a/drivers/pcmcia/cs.c
++++ b/drivers/pcmcia/cs.c
+@@ -560,7 +560,8 @@ static int socket_early_resume(struct pcmcia_socket *skt)
+ 	skt->ops->init(skt);
+ 	skt->ops->set_socket(skt, &skt->socket);
+ 	if (skt->state & SOCKET_PRESENT)
+-		skt->resume_status = socket_setup(skt, resume_delay);
++		if (socket_setup(skt, resume_delay))
++			skt->state |= SOCKET_RESUME_FAILED;
+ 	return 0;
+ }
+ 
+@@ -571,7 +572,7 @@ static int socket_late_resume(struct pcmcia_socket *skt)
+ 		return socket_insert(skt);
+ 	}
+ 
+-	if (skt->resume_status == 0) {
++	if (!(skt->state & SOCKET_RESUME_FAILED)) {
+ 		/*
+ 		 * FIXME: need a better check here for cardbus cards.
+ 		 */
+@@ -594,7 +595,7 @@ static int socket_late_resume(struct pcmcia_socket *skt)
+ 		socket_shutdown(skt);
+ 	}
+ 
+-	skt->state &= ~SOCKET_SUSPEND;
++	skt->state &= ~(SOCKET_SUSPEND | SOCKET_RESUME_FAILED);
+ 
+ 	return 0;
+ }
+diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h
+index 79615e6..e10e616 100644
+--- a/drivers/pcmcia/cs_internal.h
++++ b/drivers/pcmcia/cs_internal.h
+@@ -86,6 +86,7 @@ struct pccard_resource_ops {
+ #define SOCKET_WIN_REQ(i)	(0x0100<<(i))
+ #define SOCKET_CARDBUS		0x8000
+ #define SOCKET_CARDBUS_CONFIG	0x10000
++#define SOCKET_RESUME_FAILED	0x20000
+ 
+ static inline int cs_socket_get(struct pcmcia_socket *skt)
+ {
+diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
+index fbc0146..10ee3a8 100644
+--- a/include/pcmcia/ss.h
++++ b/include/pcmcia/ss.h
+@@ -262,8 +262,6 @@ struct pcmcia_socket {
+ 	struct device			dev;
+ 	/* data internal to the socket driver */
+ 	void				*driver_data;
+-	/* status of the card during resume from a system sleep state */
+-	int				resume_status;
+ };
+ 
+ 

Modified: dists/sid/linux-2.6/debian/patches/series/2
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/2	Sun Nov 15 17:01:44 2009	(r14632)
+++ dists/sid/linux-2.6/debian/patches/series/2	Sun Nov 15 18:12:26 2009	(r14633)
@@ -6,3 +6,4 @@
 - bugfix/all/cpuidle-return-with-irq-enabled.patch
 + bugfix/arm/isdn-hisax-elsa-build-fix.patch
 + bugfix/all/stable/2.6.31.6.patch
++ bugfix/all/undo-pcmcia-abi-change.patch