USB: atm: ueagle-atm: add missing endpoint check (09068c1a) · Commits · 戴 / test

drivers/usb/atm/ueagle-atm.c

+12 −6

Original line number	Diff line number	Diff line
		@@ -2124,10 +2124,11 @@ resubmit:
		/*
		* Start the modem : init the data and start kernel thread
		*/
		static int uea_boot(struct uea_softc *sc)
		static int uea_boot(struct uea_softc sc, struct usb_interface intf)
		{
		int ret, size;
		struct intr_pkt *intr;
		int ret = -ENOMEM;
		int size;

		uea_enters(INS_TO_USBDEV(sc));

		@@ -2152,6 +2153,11 @@ static int uea_boot(struct uea_softc *sc)
		if (UEA_CHIP_VERSION(sc) == ADI930)
		load_XILINX_firmware(sc);

		if (intf->cur_altsetting->desc.bNumEndpoints < 1) {
		ret = -ENODEV;
		goto err0;
		}

		intr = kmalloc(size, GFP_KERNEL);
		if (!intr)
		goto err0;
		@@ -2163,8 +2169,7 @@ static int uea_boot(struct uea_softc *sc)
		usb_fill_int_urb(sc->urb_int, sc->usb_dev,
		usb_rcvintpipe(sc->usb_dev, UEA_INTR_PIPE),
		intr, size, uea_intr, sc,
		sc->usb_dev->actconfig->interface[0]->altsetting[0].
		endpoint[0].desc.bInterval);
		intf->cur_altsetting->endpoint[0].desc.bInterval);

		ret = usb_submit_urb(sc->urb_int, GFP_KERNEL);
		if (ret < 0) {
		@@ -2179,6 +2184,7 @@ static int uea_boot(struct uea_softc *sc)
		sc->kthread = kthread_create(uea_kthread, sc, "ueagle-atm");
		if (IS_ERR(sc->kthread)) {
		uea_err(INS_TO_USBDEV(sc), "failed to create thread\n");
		ret = PTR_ERR(sc->kthread);
		goto err2;
		}

		@@ -2193,7 +2199,7 @@ err1:
		kfree(intr);
		err0:
		uea_leaves(INS_TO_USBDEV(sc));
		return -ENOMEM;
		return ret;
		}

		/*
		@@ -2548,7 +2554,7 @@ static int uea_bind(struct usbatm_data usbatm, struct usb_interface intf,
		}
		}

		ret = uea_boot(sc);
		ret = uea_boot(sc, intf);
		if (ret < 0)
		goto error;