diff options
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r-- | drivers/pcmcia/pcmcia_resource.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index a48d4a91d440..975baaa8168b 100644 --- a/drivers/pcmcia/pcmcia_resource.c +++ b/drivers/pcmcia/pcmcia_resource.c | |||
@@ -193,7 +193,7 @@ EXPORT_SYMBOL(pcmcia_write_config_byte); | |||
193 | 193 | ||
194 | 194 | ||
195 | int pcmcia_map_mem_page(struct pcmcia_device *p_dev, window_handle_t wh, | 195 | int pcmcia_map_mem_page(struct pcmcia_device *p_dev, window_handle_t wh, |
196 | memreq_t *req) | 196 | unsigned int offset) |
197 | { | 197 | { |
198 | struct pcmcia_socket *s = p_dev->socket; | 198 | struct pcmcia_socket *s = p_dev->socket; |
199 | int ret; | 199 | int ret; |
@@ -201,12 +201,9 @@ int pcmcia_map_mem_page(struct pcmcia_device *p_dev, window_handle_t wh, | |||
201 | wh--; | 201 | wh--; |
202 | if (wh >= MAX_WIN) | 202 | if (wh >= MAX_WIN) |
203 | return -EINVAL; | 203 | return -EINVAL; |
204 | if (req->Page != 0) { | 204 | |
205 | dev_dbg(&s->dev, "failure: requested page is zero\n"); | ||
206 | return -EINVAL; | ||
207 | } | ||
208 | mutex_lock(&s->ops_mutex); | 205 | mutex_lock(&s->ops_mutex); |
209 | s->win[wh].card_start = req->CardOffset; | 206 | s->win[wh].card_start = offset; |
210 | ret = s->ops->set_mem_map(s, &s->win[wh]); | 207 | ret = s->ops->set_mem_map(s, &s->win[wh]); |
211 | if (ret) | 208 | if (ret) |
212 | dev_warn(&s->dev, "failed to set_mem_map\n"); | 209 | dev_warn(&s->dev, "failed to set_mem_map\n"); |