lkml.org 
[lkml]   [2001]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH 2.4.9-ac16] usb serial compile error.
On Fri, Sep 28, 2001 at 11:52:03AM +0200, Stelian Pop wrote:
> When compiling a USB serial driver (mct_u232 in my case)
> without USB generic serial support, the compile process
> stops because of undefined 'vendor' and 'product'
> symbols.
>
> The attached patch corrects this issue.

Here's a bit nicer patch, which has been sent to Alan.

thanks,

greg k-h
diff --minimal -Nru a/drivers/usb/serial/usbserial.c b/drivers/usb/serial/usbserial.c
--- a/drivers/usb/serial/usbserial.c Fri Sep 28 09:51:10 2001
+++ b/drivers/usb/serial/usbserial.c Fri Sep 28 09:51:10 2001
@@ -307,7 +307,7 @@
/*
* Version Information
*/
-#define DRIVER_VERSION "v1.3"
+#define DRIVER_VERSION "v1.4"
#define DRIVER_AUTHOR "Greg Kroah-Hartman, greg@kroah.com, http://www.kroah.com/linux-usb/"
#define DRIVER_DESC "USB Serial Driver core"

@@ -343,6 +343,13 @@
num_ports: 1,
shutdown: generic_shutdown,
};
+
+#define if_generic_do(x) \
+ if ((serial->dev->descriptor.idVendor == vendor) && \
+ (serial->dev->descriptor.idProduct == product)) \
+ x
+#else
+#define if_generic_do(x)
#endif


@@ -765,9 +772,7 @@
return -ENODEV;

/* only increment our usage count, if this device is _really_ a generic device */
- if ((serial->dev->descriptor.idVendor == vendor) &&
- (serial->dev->descriptor.idProduct == product))
- MOD_INC_USE_COUNT;
+ if_generic_do(MOD_INC_USE_COUNT);

dbg(__FUNCTION__ " - port %d", port->number);

@@ -829,9 +834,7 @@
up (&port->sem);

/* only decrement our usage count, if this device is _really_ a generic device */
- if ((serial->dev->descriptor.idVendor == vendor) &&
- (serial->dev->descriptor.idProduct == product))
- MOD_DEC_USE_COUNT;
+ if_generic_do(MOD_DEC_USE_COUNT);
}

\
 
 \ /
  Last update: 2005-03-22 13:03    [W:0.035 / U:8.300 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site