diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-12-16 12:25:38 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-12-16 12:25:38 +0100 |
| commit | 8ab7913675726e5ae23b91221c0b5442d986d44a (patch) | |
| tree | f2673dcb25e864cc87abe3f2d58db9bf9730f148 /drivers/mmc/core/debugfs.c | |
| parent | 864b94adfcba752aa902ee34497bbe58b97aa8d3 (diff) | |
| parent | 3a5dc1fafb016560315fe45bb4ef8bde259dd1bc (diff) | |
| download | op-kernel-dev-8ab7913675726e5ae23b91221c0b5442d986d44a.zip op-kernel-dev-8ab7913675726e5ae23b91221c0b5442d986d44a.tar.gz | |
Merge branch 'x86/vt-d' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu into x86/apic-picks
Required to apply Jiangs x86 irq handling rework without creating a
nightmare of conflicts.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/mmc/core/debugfs.c')
| -rw-r--r-- | drivers/mmc/core/debugfs.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c index 91eb162..e914210 100644 --- a/drivers/mmc/core/debugfs.c +++ b/drivers/mmc/core/debugfs.c @@ -291,14 +291,8 @@ static int mmc_ext_csd_open(struct inode *inode, struct file *filp) if (!buf) return -ENOMEM; - ext_csd = kmalloc(512, GFP_KERNEL); - if (!ext_csd) { - err = -ENOMEM; - goto out_free; - } - mmc_get_card(card); - err = mmc_send_ext_csd(card, ext_csd); + err = mmc_get_ext_csd(card, &ext_csd); mmc_put_card(card); if (err) goto out_free; @@ -314,7 +308,6 @@ static int mmc_ext_csd_open(struct inode *inode, struct file *filp) out_free: kfree(buf); - kfree(ext_csd); return err; } |
