summaryrefslogtreecommitdiff
path: root/sys/dev/flash
diff options
context:
space:
mode:
authorAdrian Chadd <adrian@FreeBSD.org>2016-04-17 02:05:45 +0000
committerAdrian Chadd <adrian@FreeBSD.org>2016-04-17 02:05:45 +0000
commit75b3cfd252af255268d37ce4a3b25b9d8ce3bd9b (patch)
tree8b5d368dc3c0bfea4485caa50f13d91ac71bb99a /sys/dev/flash
parentb9dd6a90b68f6c0d79c0e9bf49c5c10b9a6393aa (diff)
Notes
Diffstat (limited to 'sys/dev/flash')
-rw-r--r--sys/dev/flash/at45d.c6
-rw-r--r--sys/dev/flash/mx25l.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/flash/at45d.c b/sys/dev/flash/at45d.c
index 347ed9051d6d..4d3896de1d61 100644
--- a/sys/dev/flash/at45d.c
+++ b/sys/dev/flash/at45d.c
@@ -121,7 +121,7 @@ static int
at45d_get_status(device_t dev, uint8_t *status)
{
uint8_t rxBuf[8], txBuf[8];
- struct spi_command cmd;
+ struct spi_command cmd = SPI_COMMAND_INITIALIZER;
int err;
memset(&cmd, 0, sizeof(cmd));
@@ -141,7 +141,7 @@ static int
at45d_get_mfg_info(device_t dev, uint8_t *resp)
{
uint8_t rxBuf[8], txBuf[8];
- struct spi_command cmd;
+ struct spi_command cmd = SPI_COMMAND_INITIALIZER;
int err;
memset(&cmd, 0, sizeof(cmd));
@@ -303,7 +303,7 @@ at45d_task(void *arg)
uint8_t rxBuf[8], txBuf[8];
struct at45d_softc *sc;
struct bio *bp;
- struct spi_command cmd;
+ struct spi_command cmd = SPI_COMMAND_INITIALIZER;
device_t dev, pdev;
caddr_t buf;
u_long len, resid;
diff --git a/sys/dev/flash/mx25l.c b/sys/dev/flash/mx25l.c
index 96fb4a4907a6..645fb36f27a7 100644
--- a/sys/dev/flash/mx25l.c
+++ b/sys/dev/flash/mx25l.c
@@ -432,11 +432,13 @@ mx25l_set_4b_mode(device_t dev, uint8_t command)
return (err);
}
+#ifdef FDT
static struct ofw_compat_data compat_data[] = {
{ "st,m25p", 1 },
{ "jedec,spi-nor", 1 },
{ NULL, 0 },
};
+#endif
static int
mx25l_probe(device_t dev)