korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 08:44:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

MMC host:

Browse Source 
- sdhci_am654: Fix support for UHS-I SDR12 and SDR25 speed modes
 
 MEMSTICK:
  - Fix memory leak if card device never gets registered
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEugLDXPmKSktSkQsV/iaEJXNYjCkFAmQ+VzkXHHVsZi5oYW5z
 c29uQGxpbmFyby5vcmcACgkQ/iaEJXNYjCk4ChAA1G/FkKwsK3FgJUv3U8H+4erN
 W+nz2BbOwldTon7BuKN5T2UDu4/a+ykDZP+C8zlQPcFcw8V/L7Q+hulSfSjbQSGk
 CWSTy2AlD1jG0YInZAo6WhzxBchXX7HYDajINgU3CH4dK2TDsXgclA+7S4gghrcO
 URfbGx611jfyEcae3UsqqtccbCFbYsvKkFRGZTR1LN8GAxedakmsXh4nFYG1pUl+
 jITZd9V/85hTjeRKDtQO4l1m+UV1jy0ud/yM8BOMM0lMnDjB8o0hiLMQseQbsX4I
 DobfqNibHgSoLuBQ0iB0ywOloA/1Qwu2Ixe1zSmPxLniVpy6xRbLrZg7PTnIUA6H
 e5bVZ5spxA5GtBp/1XrvcwkDc/hjUBcVvTdbCBMJpEj342G8jWj78VNxm1B6Q6ic
 KFm6wM7ynbGUlBS5Apxugd5s5otsv2vwX9D0CbuW5yOFyoe7RXImLoHJPD/rVE7D
 i8iQ4htroyea4rAEGyjAy2PQqNBI/yPRpjyF3MkiY8AS3itoMGeDMFJN1c6f9K+y
 +U2JB3nDPVjQeGr/r+4Ga5mMZnIDKZ0SoSyhOnQBnlKAcPQxBhtsi+KN477W4AWP
 Ys61hCRHBM6McYKW5BrLehsspl+7MBM3Qub/fSKt6dv6h0krz3qlKOdrRDFJ6Qz+
 3tWfc4tVj+2GL3mATr4=
 =Ys1G
 -----END PGP SIGNATURE-----

Merge tag 'mmc-v6.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Pull MMC fixes from Ulf Hansson:
 "MMC host:

   - sdhci_am654: Fix support for UHS-I SDR12 and SDR25 speed modes

  MEMSTICK:

   - Fix memory leak if card device never gets registered"

* tag 'mmc-v6.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  memstick: fix memory leak if card device is never registered
  mmc: sdhci_am654: Set HIGH_SPEED_ENA for SDR12 and SDR25
This commit is contained in:
Linus Torvalds 2023-04-18 10:11:49 -07:00
commit af67688dca
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/memstick/core/memstick.c
View File

@ -410,6 +410,7 @@ static struct memstick_dev *memstick_alloc_card(struct memstick_host *host)
return card;
err_out:
host->card = old_card;
kfree_const(card->dev.kobj.name);
kfree(card);
return NULL;
}
@ -468,8 +469,10 @@ static void memstick_check(struct work_struct *work)
put_device(&card->dev);
host->card = NULL;
}
} else
} else {
kfree_const(card->dev.kobj.name);
kfree(card);
}
}
out_power_off:

2
drivers/mmc/host/sdhci_am654.c
View File

@ -351,8 +351,6 @@ static void sdhci_am654_write_b(struct sdhci_host *host, u8 val, int reg)
*/
case MMC_TIMING_SD_HS:
case MMC_TIMING_MMC_HS:
case MMC_TIMING_UHS_SDR12:
case MMC_TIMING_UHS_SDR25:
val &= ~SDHCI_CTRL_HISPD;
}
}