summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-07-12 07:10:18 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-07-12 07:10:18 +0200
commit5ed435f33dc6a31cd93b6f38a14dd775977cf1cc (patch)
treea5679efee0260214cece15ba83938e4c6f007f11 /drivers/usb
parent05f49fa0edb6166f80b8a37a172d6b83db2d92d1 (diff)
parentba927c778091295310fdb105e10c257a0cfc61a3 (diff)
downloadbarebox-5ed435f33dc6a31cd93b6f38a14dd775977cf1cc.tar.gz
barebox-5ed435f33dc6a31cd93b6f38a14dd775977cf1cc.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/f_fastboot.c2
-rw-r--r--drivers/usb/misc/usb251xb.c10
2 files changed, 4 insertions, 8 deletions
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index bdf0c807df..82a202cc21 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -767,7 +767,7 @@ static void __maybe_unused cb_boot(struct f_fastboot *f_fb, const char *opt)
fastboot_tx_print(f_fb, FASTBOOT_MSG_INFO, "Booting kernel..\n");
globalvar_set_match("linux.bootargs.dyn.", "");
- globalvar_set_match("bootm.", "");
+ globalvar_set_match("bootm.image", "");
data.os_file = xstrdup(FASTBOOT_TMPFILE);
diff --git a/drivers/usb/misc/usb251xb.c b/drivers/usb/misc/usb251xb.c
index 97f55efa82..10d5aa310b 100644
--- a/drivers/usb/misc/usb251xb.c
+++ b/drivers/usb/misc/usb251xb.c
@@ -339,7 +339,7 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
{
struct device_d *dev = hub->dev;
struct device_node *np = dev->device_node;
- int len, err, i;
+ int len, i;
u32 port, property_u32 = 0;
const u32 *cproperty_u32;
const char *cproperty_char;
@@ -374,10 +374,6 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
return ret;
} else if (hub->gpio_reset == -EPROBE_DEFER) {
return -EPROBE_DEFER;
- } else {
- err = hub->gpio_reset;
- dev_err(dev, "unable to request GPIO reset pin (%d)\n", err);
- return err;
}
if (of_property_read_u16_array(np, "vendor-id", &hub->vendor_id, 1))
@@ -612,13 +608,13 @@ static const struct of_device_id usb251xb_of_match[] = {
/* sentinel */
}
};
-#else /* CONFIG_OF */
+#else /* CONFIG_OFDEVICE */
static int usb251xb_get_ofdata(struct usb251xb *hub,
struct usb251xb_data *data)
{
return 0;
}
-#endif /* CONFIG_OF */
+#endif /* CONFIG_OFDEVICE */
static int usb251xb_probe(struct usb251xb *hub)
{