Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Unified Diff: drivers/net/usb/gobi/qcusbnet.c

Issue 6672003: CHROMIUM: qcusbnet: Add gobi3k support. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/kernel.git@master
Patch Set: Fixes per jglasgow. Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | drivers/net/usb/gobi/qmidevice.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: drivers/net/usb/gobi/qcusbnet.c
diff --git a/drivers/net/usb/gobi/qcusbnet.c b/drivers/net/usb/gobi/qcusbnet.c
index 7e218a81fe3217e7a7595ceabd2aaabc251b3da6..0b931b8e8538ab129b1fca92b59cf660fc52d4ad 100644
--- a/drivers/net/usb/gobi/qcusbnet.c
+++ b/drivers/net/usb/gobi/qcusbnet.c
@@ -21,9 +21,9 @@
#include "qmi.h"
#include "qcusbnet.h"
-#define DRIVER_VERSION "1.0.110"
+#define DRIVER_VERSION "1.0.110+google"
#define DRIVER_AUTHOR "Qualcomm Innovation Center"
-#define DRIVER_DESC "QCUSBNet2k"
+#define DRIVER_DESC "gobi"
int qcusbnet_debug;
static struct class *devclass;
@@ -132,7 +132,8 @@ static int qcnet_bind(struct usbnet *usbnet, struct usb_interface *iface)
return -EINVAL;
}
- if (iface->cur_altsetting->desc.bInterfaceNumber != 0) {
+ if (iface->cur_altsetting->desc.bInterfaceNumber != 0
+ && iface->cur_altsetting->desc.bInterfaceNumber != 5) {
DBG("invalid interface %d\n",
iface->cur_altsetting->desc.bInterfaceNumber);
return -EINVAL;
@@ -531,6 +532,9 @@ static const struct usb_device_id qc_vidpids[] = {
MKVIDPID(0x05c6, 0x9225), /* Sony Gobi 2000 */
MKVIDPID(0x05c6, 0x9235), /* Top Global Gobi 2000 */
MKVIDPID(0x05c6, 0x9275), /* iRex Technologies Gobi 2000 */
+
+ MKVIDPID(0x05c6, 0x920d), /* Qualcomm Gobi 3000 */
+ MKVIDPID(0x1410, 0xa021), /* Novatel Gobi 3000 */
{ }
};
@@ -612,7 +616,7 @@ int qcnet_probe(struct usb_interface *iface, const struct usb_device_id *vidpids
EXPORT_SYMBOL_GPL(qcnet_probe);
static struct usb_driver qcusbnet = {
- .name = "QCUSBNet2k",
+ .name = "gobi",
.id_table = qc_vidpids,
.probe = qcnet_probe,
.disconnect = usbnet_disconnect,
« no previous file with comments | « no previous file | drivers/net/usb/gobi/qmidevice.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698