tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

usb: misc: cytherm: don't print on ENOMEM

All kmalloc-based functions print enough information on failures.

Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Wolfram Sang and committed by
Greg Kroah-Hartman 29a99df1 e83c06e9

+8 -24
+8 -24
drivers/usb/misc/cytherm.c
··· 101 101 int retval; 102 102 103 103 buffer = kmalloc(8, GFP_KERNEL); 104 - if (!buffer) { 105 - dev_err(&cytherm->udev->dev, "out of memory\n"); 104 + if (!buffer) 106 105 return 0; 107 - } 108 106 109 107 cytherm->brightness = simple_strtoul(buf, NULL, 10); 110 108 ··· 146 148 int temp, sign; 147 149 148 150 buffer = kmalloc(8, GFP_KERNEL); 149 - if (!buffer) { 150 - dev_err(&cytherm->udev->dev, "out of memory\n"); 151 + if (!buffer) 151 152 return 0; 152 - } 153 153 154 154 /* read temperature */ 155 155 retval = vendor_command(cytherm->udev, READ_RAM, TEMP, 0, buffer, 8); ··· 188 192 unsigned char *buffer; 189 193 190 194 buffer = kmalloc(8, GFP_KERNEL); 191 - if (!buffer) { 192 - dev_err(&cytherm->udev->dev, "out of memory\n"); 195 + if (!buffer) 193 196 return 0; 194 - } 195 197 196 198 /* check button */ 197 199 retval = vendor_command(cytherm->udev, READ_RAM, BUTTON, 0, buffer, 8); ··· 224 230 unsigned char *buffer; 225 231 226 232 buffer = kmalloc(8, GFP_KERNEL); 227 - if (!buffer) { 228 - dev_err(&cytherm->udev->dev, "out of memory\n"); 233 + if (!buffer) 229 234 return 0; 230 - } 231 235 232 236 retval = vendor_command(cytherm->udev, READ_PORT, 0, 0, buffer, 8); 233 237 if (retval) ··· 249 257 int tmp; 250 258 251 259 buffer = kmalloc(8, GFP_KERNEL); 252 - if (!buffer) { 253 - dev_err(&cytherm->udev->dev, "out of memory\n"); 260 + if (!buffer) 254 261 return 0; 255 - } 256 262 257 263 tmp = simple_strtoul(buf, NULL, 10); 258 264 ··· 280 290 unsigned char *buffer; 281 291 282 292 buffer = kmalloc(8, GFP_KERNEL); 283 - if (!buffer) { 284 - dev_err(&cytherm->udev->dev, "out of memory\n"); 293 + if (!buffer) 285 294 return 0; 286 - } 287 295 288 296 retval = vendor_command(cytherm->udev, READ_PORT, 1, 0, buffer, 8); 289 297 if (retval) ··· 305 317 int tmp; 306 318 307 319 buffer = kmalloc(8, GFP_KERNEL); 308 - if (!buffer) { 309 - dev_err(&cytherm->udev->dev, "out of memory\n"); 320 + if (!buffer) 310 321 return 0; 311 - } 312 322 313 323 tmp = simple_strtoul(buf, NULL, 10); 314 324 ··· 337 351 int retval = -ENOMEM; 338 352 339 353 dev = kzalloc (sizeof(struct usb_cytherm), GFP_KERNEL); 340 - if (dev == NULL) { 341 - dev_err (&interface->dev, "Out of memory\n"); 354 + if (!dev) 342 355 goto error_mem; 343 - } 344 356 345 357 dev->udev = usb_get_dev(udev); 346 358