Merge branch 'upstream-fixes' into upstream

Conflicts:

	drivers/scsi/sata_sil24.c

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 48d3b3d30c21..74b3124e8247 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -1143,6 +1143,12 @@ static int ds_event(struct pcmcia_socket *skt, event_t event, int priority)
 {
         struct pcmcia_socket *s = pcmcia_get_socket(skt);
 
+        if (!s) {
+                printk(KERN_ERR "PCMCIA obtaining reference to socket %p " \
+                        "failed, event 0x%x lost!\n", skt, event);
+                return -ENODEV;
+        }
+
         ds_dbg(1, "ds_event(0x%06x, %d, 0x%p)\n",
                event, priority, skt);