diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-17 17:24:35 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-17 17:24:35 +0400 |
| commit | 753e23ea588d353da9d0a2672828336453607265 (patch) | |
| tree | a0eb4875ecde41725fe890e27f52d69812031ea1 /drivers/block/mg_disk.c | |
| parent | c999836d37c6c1125e856f68877ae13952baa61a (diff) | |
| parent | 41ef2d5678d83af030125550329b6ae8b74618fa (diff) | |
| download | linux-753e23ea588d353da9d0a2672828336453607265.tar.xz | |
Merge tag 'v3.9-rc7' into asoc-dma
Linux 3.9-rc7
Diffstat (limited to 'drivers/block/mg_disk.c')
| -rw-r--r-- | drivers/block/mg_disk.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c index 1788f491e0fb..076ae7f1b781 100644 --- a/drivers/block/mg_disk.c +++ b/drivers/block/mg_disk.c @@ -890,8 +890,10 @@ static int mg_probe(struct platform_device *plat_dev) gpio_direction_output(host->rst, 1); /* reset out pin */ - if (!(prv_data->dev_attr & MG_DEV_MASK)) + if (!(prv_data->dev_attr & MG_DEV_MASK)) { + err = -EINVAL; goto probe_err_3a; + } if (prv_data->dev_attr != MG_BOOT_DEV) { rsc = platform_get_resource_byname(plat_dev, IORESOURCE_IO, |