aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/pcmcia_resource.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pcmcia/pcmcia_resource.c')
-rw-r--r--drivers/pcmcia/pcmcia_resource.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 50468543d607..1cf7d54fb7e2 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -752,9 +752,9 @@ EXPORT_SYMBOL(pcmcia_request_irq);
752 * Request_window() establishes a mapping between card memory space 752 * Request_window() establishes a mapping between card memory space
753 * and system memory space. 753 * and system memory space.
754 */ 754 */
755int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_handle_t *wh) 755int pcmcia_request_window(struct pcmcia_device *p_dev, win_req_t *req, window_handle_t *wh)
756{ 756{
757 struct pcmcia_socket *s = (*p_dev)->socket; 757 struct pcmcia_socket *s = p_dev->socket;
758 pccard_mem_map *win; 758 pccard_mem_map *win;
759 u_long align; 759 u_long align;
760 int w; 760 int w;
@@ -804,7 +804,7 @@ int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_h
804 return -EINVAL; 804 return -EINVAL;
805 } 805 }
806 } 806 }
807 (*p_dev)->_win |= CLIENT_WIN_REQ(w); 807 p_dev->_win |= CLIENT_WIN_REQ(w);
808 808
809 /* Configure the socket controller */ 809 /* Configure the socket controller */
810 win->map = w+1; 810 win->map = w+1;