--- drivers/net/usb/pegasus.c.old 2007-07-10 11:39:50.000000000 +0300 +++ drivers/net/usb/pegasus.c 2007-07-30 11:02:10.000000000 +0300 @@ -100,9 +100,6 @@ static void ctrl_callback(struct urb *ur { pegasus_t *pegasus = urb->context; - if (!pegasus) - return; - switch (urb->status) { case 0: if (pegasus->flags & ETH_REGS_CHANGE) { @@ -609,15 +606,11 @@ static inline struct sk_buff *pull_skb(p static void read_bulk_callback(struct urb *urb) { pegasus_t *pegasus = urb->context; - struct net_device *net; + struct net_device *net = pegasus->net; int rx_status, count = urb->actual_length; u8 *buf = urb->transfer_buffer; __u16 pkt_len; - if (!pegasus) - return; - - net = pegasus->net; if (!netif_device_present(net) || !netif_running(net)) return; @@ -770,9 +763,6 @@ static void write_bulk_callback(struct u pegasus_t *pegasus = urb->context; struct net_device *net = pegasus->net; - if (!pegasus) - return; - if (!netif_device_present(net) || !netif_running(net)) return; @@ -805,13 +795,9 @@ static void write_bulk_callback(struct u static void intr_callback(struct urb *urb) { pegasus_t *pegasus = urb->context; - struct net_device *net; + struct net_device *net = pegasus->net; int status; - if (!pegasus) - return; - net = pegasus->net; - switch (urb->status) { case 0: break;