Commit af67688d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents bbab2531 4b6d621c

drivers/memstick/core/memstick.c

+4 −1
Original line number Diff line number Diff line
@@ -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,9 +469,11 @@ 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:

	if (!host->card)

drivers/mmc/host/sdhci_am654.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

		}

	}