patch-2.3.34 linux/drivers/pcmcia/bulkmem.c

• Lines: 52
• Date: Sat Dec 18 15:43:16 1999
• Orig file: v2.3.33/linux/drivers/pcmcia/bulkmem.c
• Orig date: Tue Dec 14 01:27:24 1999

diff -u --recursive --new-file v2.3.33/linux/drivers/pcmcia/bulkmem.c linux/drivers/pcmcia/bulkmem.c
@@ -294,7 +294,13 @@
 {
     switch (func) {
     case MTDRequestWindow:
-	return pcmcia_request_window(a1, a2);
+    {
+	window_handle_t w;
+        int ret = pcmcia_request_window(a1, a2, &w);
+        (window_handle_t *)a1 = w;
+	return  ret;
+    }
+        break;
     case MTDReleaseWindow:
 	return pcmcia_release_window(a1);
     case MTDModifyWindow:
@@ -470,7 +476,8 @@
     
 ======================================================================*/
 
-int pcmcia_register_erase_queue(client_handle_t *handle, eraseq_hdr_t *header)
+int pcmcia_register_erase_queue(client_handle_t *handle, eraseq_hdr_t *header,
+                                 eraseq_handle_t *e)
 {
     eraseq_t *queue;
 
@@ -481,7 +488,7 @@
     queue->handle = *handle;
     queue->count = header->QueueEntryCnt;
     queue->entry = header->QueueEntryArray;
-    *handle = (client_handle_t)queue;
+    *e = queue;
     return CS_SUCCESS;
 } /* register_erase_queue */
 
@@ -517,7 +524,7 @@
     
 ======================================================================*/
 
-int pcmcia_open_memory(client_handle_t *handle, open_mem_t *open)
+int pcmcia_open_memory(client_handle_t *handle, open_mem_t *open, memory_handle_t *mh)
 {
     socket_info_t *s;
     memory_handle_t region;
@@ -534,7 +541,7 @@
 	region = region->info.next;
     }
     if (region && region->mtd) {
-	*handle = (client_handle_t)region;
+	*mh = region;
 	DEBUG(1, "cs: open_memory(0x%p, 0x%x) = 0x%p\n",
 	      handle, open->Offset, region);
 	return CS_SUCCESS;