diff --git a/[refs] b/[refs] index fb2861a774dd..13c3e0e871c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef925e52119e149f9321b948c2cd0bdce755c917 +refs/heads/master: b0c47e1ec2a5d66df4ef5d34055a919140aa386a diff --git a/trunk/drivers/media/usb/stk1160/stk1160-core.c b/trunk/drivers/media/usb/stk1160/stk1160-core.c index 74236fd3b7ec..b62740846061 100644 --- a/trunk/drivers/media/usb/stk1160/stk1160-core.c +++ b/trunk/drivers/media/usb/stk1160/stk1160-core.c @@ -256,14 +256,12 @@ static int stk1160_scan_usb(struct usb_interface *intf, struct usb_device *udev, static int stk1160_probe(struct usb_interface *interface, const struct usb_device_id *id) { - int ifnum; int rc = 0; unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */ struct usb_device *udev; struct stk1160 *dev; - ifnum = interface->altsetting[0].desc.bInterfaceNumber; udev = interface_to_usbdev(interface); /*