patch-2.4.0-test7 linux/drivers/pcmcia/cs.c

Next file: linux/drivers/sbus/char/rtc.c
Previous file: linux/drivers/pci/setup-res.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test6/linux/drivers/pcmcia/cs.c linux/drivers/pcmcia/cs.c
@@ -596,9 +596,11 @@
 	    s->state &= ~SOCKET_SETUP_PENDING;
 	} else {
 	    send_event(s, CS_EVENT_CARD_RESET, CS_EVENT_PRI_LOW);
-	    s->reset_handle->event_callback_args.info = NULL;
-	    EVENT(s->reset_handle, CS_EVENT_RESET_COMPLETE,
-		  CS_EVENT_PRI_LOW);
+	    if (s->reset_handle) { 
+		    s->reset_handle->event_callback_args.info = NULL;
+		    EVENT(s->reset_handle, CS_EVENT_RESET_COMPLETE,
+			  CS_EVENT_PRI_LOW);
+	    }
 	    s->state &= ~EVENT_MASK;
 	}
 } /* unreset_socket */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)