2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c
index b9837cc5b9ac..198561d21710 100644
--- a/drivers/mmc/mmc_block.c
+++ b/drivers/mmc/mmc_block.c
@@ -257,7 +257,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
                          */
                         add_disk_randomness(req->rq_disk);
                         blkdev_dequeue_request(req);
-                        end_that_request_last(req);
+                        end_that_request_last(req, 1);
                 }
                 spin_unlock_irq(&md->lock);
         } while (ret);
@@ -283,7 +283,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
 
         add_disk_randomness(req->rq_disk);
         blkdev_dequeue_request(req);
-        end_that_request_last(req);
+        end_that_request_last(req, 0);
         spin_unlock_irq(&md->lock);
 
         return 0;
diff --git a/drivers/mmc/mmc_sysfs.c b/drivers/mmc/mmc_sysfs.c
index 3f4a66ca9555..ec701667abfc 100644
--- a/drivers/mmc/mmc_sysfs.c
+++ b/drivers/mmc/mmc_sysfs.c
@@ -80,7 +80,7 @@ static int mmc_bus_match(struct device *dev, struct device_driver *drv)
 }
 
 static int
-mmc_bus_hotplug(struct device *dev, char **envp, int num_envp, char *buf,
+mmc_bus_uevent(struct device *dev, char **envp, int num_envp, char *buf,
                 int buf_size)
 {
         struct mmc_card *card = dev_to_mmc_card(dev);
@@ -140,7 +140,7 @@ static struct bus_type mmc_bus_type = {
         .name           = "mmc",
         .dev_attrs      = mmc_dev_attrs,
         .match          = mmc_bus_match,
-        .hotplug        = mmc_bus_hotplug,
+        .uevent         = mmc_bus_uevent,
         .suspend        = mmc_bus_suspend,
         .resume         = mmc_bus_resume,
 };