diff options
Diffstat (limited to 'drivers/mmc/host/omap.c')
| -rw-r--r-- | drivers/mmc/host/omap.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index 98b6b6ef7e5c..42b665dfaa73 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c | |||
| @@ -1262,6 +1262,13 @@ static int mmc_omap_new_slot(struct mmc_omap_host *host, int id) | |||
| 1262 | mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count; | 1262 | mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count; |
| 1263 | mmc->max_seg_size = mmc->max_req_size; | 1263 | mmc->max_seg_size = mmc->max_req_size; |
| 1264 | 1264 | ||
| 1265 | if (slot->pdata->get_cover_state != NULL) { | ||
| 1266 | setup_timer(&slot->cover_timer, mmc_omap_cover_timer, | ||
| 1267 | (unsigned long)slot); | ||
| 1268 | tasklet_init(&slot->cover_tasklet, mmc_omap_cover_handler, | ||
| 1269 | (unsigned long)slot); | ||
| 1270 | } | ||
| 1271 | |||
| 1265 | r = mmc_add_host(mmc); | 1272 | r = mmc_add_host(mmc); |
| 1266 | if (r < 0) | 1273 | if (r < 0) |
| 1267 | goto err_remove_host; | 1274 | goto err_remove_host; |
| @@ -1278,11 +1285,6 @@ static int mmc_omap_new_slot(struct mmc_omap_host *host, int id) | |||
| 1278 | &dev_attr_cover_switch); | 1285 | &dev_attr_cover_switch); |
| 1279 | if (r < 0) | 1286 | if (r < 0) |
| 1280 | goto err_remove_slot_name; | 1287 | goto err_remove_slot_name; |
| 1281 | |||
| 1282 | setup_timer(&slot->cover_timer, mmc_omap_cover_timer, | ||
| 1283 | (unsigned long)slot); | ||
| 1284 | tasklet_init(&slot->cover_tasklet, mmc_omap_cover_handler, | ||
| 1285 | (unsigned long)slot); | ||
| 1286 | tasklet_schedule(&slot->cover_tasklet); | 1288 | tasklet_schedule(&slot->cover_tasklet); |
| 1287 | } | 1289 | } |
| 1288 | 1290 | ||